提交代码

build/utils.js

@@ -15,8 +15,8 @@ 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","AMS","TMS",'queue','WMS'];
-//let devModules = ['all']
+//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS'];
+let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

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

src/components/main.vue

@@ -2641,8 +2641,7 @@ export default {
       console.log('获取到的userId----------------' + this.userId)
       this.axios
         .post('/api/v1/ams/getNotice',
-          { orgcodezs: this.orgcodezs ,
-            userId: this.userId})
+          { userId: this.userId})
         .then(res => {
           this.noticedata = res.data.data
           this.taskAllNum = res.data.data[0].taskAllNum

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

@@ -17,6 +17,7 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
@@ -26,10 +27,26 @@ export default {
         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 = {

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

@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
@@ -26,8 +27,23 @@ export default {
       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 = {

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

@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
@@ -26,8 +27,23 @@ export default {
       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 = {

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/marketingNotice.vue

@@ -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"
@@ -75,6 +82,29 @@ export default {
     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/saleSteelAllReport.vue

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

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

@@ -280,11 +280,6 @@
           align="center"
           show-overflow-tooltip
         >
-<<<<<<< HEAD
-        </el-table-column>
-        <el-table-column prop="saler" label="业务员" align="center">
-=======
->>>>>>> aa6d2fe5d2233a2fe3f17744cc9c6bdd3b78599c
         </el-table-column>
         <el-table-column
           prop="shipperName"