提交代码

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

@@ -66,7 +66,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"
@@ -183,6 +184,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,27 @@
       </div>
     </el-dialog>
 
+    //通知弹窗
+    <el-dialog
+      :visible.sync="centerDialogVisible"
+    >
+      <div style="margin-left: 300px;font-size: 20px">
+        <h1>{{noticedata1.noticetitle}}</h1>
+      </div>
+      <div style="margin-left: 30px">
+        <i class="el-icon-document"></i>{{noticedata1.noticecontent}}
+      </div>
+      <div style="margin-left: 30px">
+        <i class="el-icon-user-solid"></i>
+        {{noticedata1.insertusername}}
+      </div>
+      <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 +761,8 @@ export default {
       }
     }
     return {
+      centerDialogVisible:false,
+      badgeshow: '',
       dutyName: '',
       regular: '', // 密码策略校验正则表达式
       regularType: '',
@@ -911,11 +937,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 +1150,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 +2626,56 @@ 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',
+          { orgcodezs: this.orgcodezs ,
+            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 +2686,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/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,11 @@
 
 <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">
@@ -52,7 +52,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -60,6 +59,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

@@ -51,7 +51,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -67,4 +66,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

@@ -51,7 +51,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -67,5 +66,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/editNotice.vue

@@ -26,17 +26,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 +73,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(

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

@@ -1,4 +1,4 @@
-//公告管理
+//公告管理(销售)
 <template>
   <div class="notice">
     <div class="sache">
@@ -64,14 +64,17 @@ 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(){
 
-
-
+    },
     CarrierNotice() {
       this.$router.push("/addNotice");
 

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

@@ -211,9 +211,6 @@
           align="center"
           width="150px"
         >
-          <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>