修改

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['index', 'inward']
+let devModules = ['all']
 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.102:8080',
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -352,15 +352,15 @@
                   <div class="workspace_message-title">
                     标题： {{ item.noticetitle }}
                   </div>
-                  <div class="workspace_message-date">
-                    时间：{{ item.inserttime }}
-                  </div>
                   <div class="workspace_message-content">
                     内容：{{ item.noticecontent }}
                   </div>
                   <div class="workspace_message-from">
                     来自: {{ item.insertusername }}
                   </div>
+                  <div class="workspace_message-date">
+                    时间：{{ item.inserttime }}
+                  </div>
                   <div style="height: 20px"></div>
                   <el-divider></el-divider>
                 </div>
@@ -663,10 +663,10 @@
     <el-dialog
       :visible.sync="centerDialogVisible"
     >
-      <div style="margin-left: 300px;font-size: 20px">
+      <div style="margin-left: 30px; font-size: 20px">
         <h1>{{noticedata1.noticetitle}}</h1>
       </div>
-      <div style="height: 10px"></div>
+      <div style="height: 20px"></div>
       <div style="margin-left: 30px">
         <i class="el-icon-document"></i>{{noticedata1.noticecontent}}
       </div>
@@ -675,7 +675,6 @@
         <i class="el-icon-user-solid"></i>
         {{noticedata1.insertusername}}
       </div>
-      <el-divider></el-divider>
       <div style="margin-left: 30px">
         <i></i>{{noticedata1.inserttime}}
       </div>
@@ -1154,12 +1153,22 @@ export default {
   },
   methods: {
     //弹框删除
-    makeSure(){
+    async makeSure(){
+      let noticeid=this.noticedata1.noticeid
+      console.log(this.noticedata1)
       this.noticedata1=[] ;
       this.centerDialogVisible=false;
-      this.badgeshow=true;
-      this.axios.post("/api/v1/ams/updateNoticeStatus",
-        {userId:this.userId})
+      await this.axios.post("/api/v1/ams/updateNoticeStatus",
+        {userId:this.userId,
+        noticeId:noticeid}).then((res)=>{
+          console.log(res.data)
+          if (res.data.data ===0){
+            this.badgeshow=true;
+          }else {
+            console.log('进入了小红点标记区')
+            this.taskAllNum=res.data.data;
+          }
+      })
     },
     // 判断是否为公司其他平台模块且处于开发模式
     isDev(url) {
@@ -2670,7 +2679,8 @@ export default {
         noticetitle:item.noticetitle,
         noticecontent:item.noticecontent,
         insertusername:item.insertusername,
-        inserttime:item.inserttime
+        inserttime:item.inserttime,
+        noticeid:item.noticeId
       }
       this.noticedata1=data
       this.centerDialogVisible=true;
@@ -2688,9 +2698,9 @@ export default {
 
 <style lang="less" scoped>
 .Web_Notice {
-  width: 500px;
+  width: 400px;
   position: absolute;
-  left: -150px;
+  left: -200px;
   height: 500px;
   background-color: #f1f6fd;
 }

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

@@ -49,11 +49,14 @@ export default {
     },
     makeSure() {
       console.log(this.form1);
+      let time=this.msToDate(this.form1.insertTime)
+      //中国标准时间转化为标准时间
       let DilNotice = {
         noticeTitle:this.form1.noticeTitle,
         insertUsername:this.form1.insertUsername,
         noticeContent:this.form1.noticeContent,
         permissions:this.form1.permission,
+        insertTime:time
         /*这里permissions拿的是描述也就是name值*/
       }
       this.axios
@@ -64,6 +67,28 @@ export default {
           this.$router.go(-1);
         });
     },
+    msToDate(msec){
+      let datetime = new Date(msec);
+      let year = datetime.getFullYear();
+      let month = datetime.getMonth();
+      let date = datetime.getDate();
+      let hour = datetime.getHours();
+      let minute = datetime.getMinutes();
+      let second = datetime.getSeconds();
+
+      let result=year+
+        '-'+
+          ((month + 1) >= 10 ? (month + 1) : '0' + (month + 1)) +
+          '-' +
+          ((date + 1) < 10 ? '0' + date : date) +
+          ' ' +
+          ((hour + 1) < 10 ? '0' + hour : hour) +
+          ':' +
+          ((minute + 1) < 10 ? '0' + minute : minute) +
+          ':' +
+          ((second + 1) < 10 ? '0' + second : second);
+      return result;
+    },
     // 取消
     cancel() {
       this.$router.go(-1);

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

@@ -46,11 +46,13 @@ export default {
     },
     makeSure() {
       console.log(this.form1);
+      let time=this.msToDate(this.form1.insertTime)
       let DilNotice = {
         noticeTitle:this.form1.noticeTitle,
         insertUsername:this.form1.insertUsername,
         noticeContent:this.form1.noticeContent,
         permissions:this.form1.permission,
+        insertTime:time
         /*这里permissions拿的是描述也就是name值*/
       }
       this.axios
@@ -61,6 +63,28 @@ export default {
           this.$router.go(-1);
         });
     },
+    msToDate(msec){
+      let datetime = new Date(msec);
+      let year = datetime.getFullYear();
+      let month = datetime.getMonth();
+      let date = datetime.getDate();
+      let hour = datetime.getHours();
+      let minute = datetime.getMinutes();
+      let second = datetime.getSeconds();
+
+      let result=year+
+        '-'+
+        ((month + 1) >= 10 ? (month + 1) : '0' + (month + 1)) +
+        '-' +
+        ((date + 1) < 10 ? '0' + date : date) +
+        ' ' +
+        ((hour + 1) < 10 ? '0' + hour : hour) +
+        ':' +
+        ((minute + 1) < 10 ? '0' + minute : minute) +
+        ':' +
+        ((second + 1) < 10 ? '0' + second : second);
+      return result;
+    },
     // 取消
     cancel() {
       this.$router.go(-1);

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

@@ -46,13 +46,16 @@ export default {
     },
     makeSure() {
       console.log(this.form1);
+      let time=this.msToDate(this.form1.insertTime)
       let DilNotice = {
         noticeTitle:this.form1.noticeTitle,
         insertUsername:this.form1.insertUsername,
         noticeContent:this.form1.noticeContent,
         permissions:this.form1.permission,
+        insertTime:time
         /*这里permissions拿的是描述也就是name值*/
       }
+      console.log(DilNotice)
       this.axios
         .post(
           "/api/v1/ams/insertNotice",DilNotice
@@ -61,6 +64,28 @@ export default {
           this.$router.go(-1);
         });
     },
+    msToDate(msec){
+      let datetime = new Date(msec);
+      let year = datetime.getFullYear();
+      let month = datetime.getMonth();
+      let date = datetime.getDate();
+      let hour = datetime.getHours();
+      let minute = datetime.getMinutes();
+      let second = datetime.getSeconds();
+
+      let result=year+
+        '-'+
+        ((month + 1) >= 10 ? (month + 1) : '0' + (month + 1)) +
+        '-' +
+        ((date + 1) < 10 ? '0' + date : date) +
+        ' ' +
+        ((hour + 1) < 10 ? '0' + hour : hour) +
+        ':' +
+        ((minute + 1) < 10 ? '0' + minute : minute) +
+        ':' +
+        ((second + 1) < 10 ? '0' + second : second);
+      return result;
+    },
     // 取消
     cancel() {
       this.$router.go(-1);

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

@@ -113,14 +113,14 @@ export default {
 
     noticeDetail(scope) {
       console.log(scope.row.noticeId)
-      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+      this.$router.push("/getNoticeById3/"+scope.row.noticeId)
 
     },
 
     /*这里要改一改*/
     updateNotice(scope){
       console.log(scope.row.noticeId)
-      this.$router.push("/editNotice/"+scope.row.noticeId)
+      this.$router.push("/editNotice3/"+scope.row.noticeId)
     },
     deleteNotice(scope){
       console.log(scope)

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

@@ -0,0 +1,136 @@
+<template>
+  <!-- 修改通知信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+<!--    <div class="main">
+      <span class="text">通知信息</span>
+    </div>-->
+    <!--class="contractTitle"-->
+    <div>
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="392" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+
+
+
+<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();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let DilNotice = {
+        noticeId:this.form1.noticeId,
+        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(
+          "/api/v1/ams/updateNotice",
+          DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form-box{
+    .el-form{
+      margin-top: 100px;
+      .preview-group{
+        width: 500px;
+        .el-form-item{
+          height: 60px;
+        }
+      }
+    }
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+<style>
+
+.el-textarea__inner{
+/*  width: 300px !important;*/
+  min-height:250px !important;
+}
+
+
+</style>
+
+
+
+

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

@@ -0,0 +1,136 @@
+<template>
+  <!-- 修改通知信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+<!--    <div class="main">
+      <span class="text">通知信息</span>
+    </div>-->
+    <!--class="contractTitle"-->
+    <div>
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="393" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+
+
+
+<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();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let DilNotice = {
+        noticeId:this.form1.noticeId,
+        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(
+          "/api/v1/ams/updateNotice",
+          DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form-box{
+    .el-form{
+      margin-top: 100px;
+      .preview-group{
+        width: 500px;
+        .el-form-item{
+          height: 60px;
+        }
+      }
+    }
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+<style>
+
+.el-textarea__inner{
+/*  width: 300px !important;*/
+  min-height:250px !important;
+}
+
+
+</style>
+
+
+
+

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

@@ -0,0 +1,100 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+<!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;margin-top: 30px;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="392" v-model="form1" ref="from1" autosize></dil-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  name:"homeworkPath",
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+
+
+
+
+  methods: {
+    information() {
+
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          }
+          );
+        });
+
+
+      },
+
+  },
+
+}
+
+</script>
+
+<style>
+
+/* .el-textarea .el-input--medium .is-disabled  {
+:rows="10"
+} */
+
+
+.el-textarea__inner{
+  font-size: 15px !important;
+  height:200px !important;
+
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+
+<!--<el-input id="FormGroup_1639361270400"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+
+>
+</el-input>-->
+

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

@@ -0,0 +1,100 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+<!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;margin-top: 30px;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="393" v-model="form1" ref="from1" autosize></dil-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  name:"homeworkPath",
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+
+
+
+
+  methods: {
+    information() {
+
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          }
+          );
+        });
+
+
+      },
+
+  },
+
+}
+
+</script>
+
+<style>
+
+/* .el-textarea .el-input--medium .is-disabled  {
+:rows="10"
+} */
+
+
+.el-textarea__inner{
+  font-size: 15px !important;
+  height:200px !important;
+
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+
+<!--<el-input id="FormGroup_1639361270400"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+
+>
+</el-input>-->
+

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

@@ -119,14 +119,14 @@ export default {
 
     noticeDetail(scope) {
       console.log(scope.row.noticeId)
-      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+      this.$router.push("/getNoticeById2/"+scope.row.noticeId)
 
     },
 
     /*这里要改一改*/
     updateNotice(scope){
       console.log(scope.row.noticeId)
-      this.$router.push("/editNotice/"+scope.row.noticeId)
+      this.$router.push("/editNotice2/"+scope.row.noticeId)
     },
     deleteNotice(scope){
       console.log(scope)

src/views/sale/router/index.js

@@ -53,7 +53,11 @@ import addNotice2 from "../components/dilNotice/addNotice2.vue";
 import carrierNotice from "../components/dilNotice/carrierNotice.vue";
 import clientNotice from "../components/dilNotice/clientNotice.vue";
 import editNotice from "../components/dilNotice/editNotice.vue";
+import editNotice2 from "../components/dilNotice/editNotice2.vue";
+import editNotice3 from "../components/dilNotice/editNotice3.vue";
 import getNoticeById from "../components/dilNotice/getNoticeById.vue";
+import getNoticeById2 from "../components/dilNotice/getNoticeById2.vue";
+import getNoticeById3 from "../components/dilNotice/getNoticeById3.vue";
 import marketingNotice from "../components/dilNotice/marketingNotice.vue";
 import newNotice from "../components/dilNotice/newNotice.vue";
 
@@ -406,12 +410,36 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: editNotice
       },
+      {
+        path: "editNotice2/:noticeId",
+        name: "editNotice2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editNotice2
+      },
+      {
+        path: "editNotice3/:noticeId",
+        name: "editNotice3",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editNotice3
+      },
       {
         path: "getNoticeById/:noticeId",
         name: "getNoticeById",
         meta: { code: "xtpzgl-yhgl" },
         component: getNoticeById
       },
+      {
+        path: "getNoticeById2/:noticeId",
+        name: "getNoticeById2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: getNoticeById2
+      },
+      {
+        path: "getNoticeById3/:noticeId",
+        name: "getNoticeById3",
+        meta: { code: "xtpzgl-yhgl" },
+        component: getNoticeById3
+      },
       {
         path: "marketingNotice",
         name: "marketingNotice",

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

@@ -569,6 +569,11 @@
               <span>状态更新时间:</span>
               <span>{{ steelMap.orderStatusTime }}</span>
             </div>
+            <div class="steelMapClass44">
+              <el-button type="success" circle @click="continue1"
+                >继续装</el-button
+              >
+            </div>
           </div>
           <div class="steelMapClass5">
             <div class="steelMapClass52" v-if="steelMap.arrivalAddress != null">
@@ -849,7 +854,9 @@ export default {
         '司机电话',
         '运输订单号',
         '签收地址',
+        '签收时间',
         '抵达地址',
+        '抵达时间',
         '出厂时间',
         '进厂时间',
         '运单状态',
@@ -973,6 +980,21 @@ export default {
   },
   computed: {},
   methods: {
+    //继续装
+    continue1(row) {
+      let map = {
+        orderId: this.steelMap.orderId
+      }
+      console.log(map)
+      this.axios.post('/api/v1/oms/updateContinueStaus', map).then(res => {
+        if (res.data.code == '200') {
+          this.$message.success('修改成功')
+        } else {
+          this.$message.error('修改失败')
+        }
+      })
+      this.getSteelReport()
+    },
     //筛选
     filterChange(obj) {
       if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
@@ -2190,6 +2212,10 @@ export default {
           margin-left: 50px;
           margin-right: 10px;
         }
+        .steelMapClass44 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
       }
       .steelMapClass5 {
         margin-top: 20px;