Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -17,7 +17,6 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
 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/inward/components/inwardBillet/addInwardBillet.vue

@@ -1,22 +1,36 @@
 // 新增内转钢坯需求
 <template>
   <div class="inwardRequirement">
-    <page-title>新增需求</page-title>
     <div>
       <!-- 用车单位 -->
       <div class="requireUnit form">
-        <el-form class="demo-form-inline" label-width="80px">
-          <el-form-item label="用车单位">
+        <el-form class="demo-form-inline" label-width="80px" :inline="true">
+          <el-form-item label="用车单位" v-show="false">
             <el-input class="inline-input" v-model="requireUnitName" disabled>
             </el-input>
           </el-form-item>
-          <el-form-item label="炉号">
-            <el-input class="inline-input" v-model="heatNo"> </el-input>
-          </el-form-item>
-          <el-form-item label="需求类型">
+          <el-form-item label="需求类型" v-show="false">
             <el-input class="inline-input" v-model="requirementType" disabled>
             </el-input>
           </el-form-item>
+          <el-form-item label="炉号">
+            <el-input class="inline-input" v-model.number="heatNo"> </el-input>
+          </el-form-item>
+          <el-form-item label="支数">
+            <el-input class="inline-input" v-model="count"> </el-input>
+          </el-form-item>
+          <!-- 车辆我设为多选了，我觉得会省事，他们应该不希望每台车都做一次 -->
+          <el-form-item label="选择车辆">
+            <el-select class="inline-select" v-model="capacityIds" multiple>
+              <el-option
+                v-for="item in optionsCapacity"
+                :label="item.capacityNumber"
+                :value="item.capacityId"
+                :key="item.capacityId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="选择班别">
             <el-select class="inline-select" v-model="clazz">
               <el-option
@@ -29,7 +43,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="选择钢种">
-            <el-select class="inline-select" v-model="type">
+            <el-select class="inline-select" v-model="type" filterable>
               <el-option
                 v-for="(item, index) in options1"
                 :key="index"
@@ -40,7 +54,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="选择规格">
-            <el-select class="inline-select" v-model="model">
+            <el-select class="inline-select" v-model="model" filterable>
               <el-option
                 v-for="(item, index) in options2"
                 :key="index"
@@ -50,7 +64,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="选择装货点">
+          <el-form-item label="选择装货点" v-show="false">
             <el-select class="inline-select" v-model="loadPoint">
               <el-option
                 v-for="item in optionsLoad"
@@ -74,47 +88,12 @@
           </el-form-item>
         </el-form>
       </div>
-      <div>
-        <el-button type="primary" @click="resetCapacity">
-          重置车辆信息
-        </el-button>
-      </div>
-      <div class="selectionTable from">
-        <el-table
-          :data="selectionList"
-          border
-          style="width: 100%"
-          highlight-current-row
-        >
-          <el-table-column type="index" label="序号" width="50">
-          </el-table-column>
-          <el-table-column
-            v-for="(item, i) in tableTop"
-            :key="i"
-            :prop="item.prop"
-            :label="item.label"
-            :width="item.width"
-            align="center"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <!-- 操作列 -->
-          <el-table-column fixed="right" label="操作" width="100">
-            <template slot-scope="scope">
-              <el-button
-                @click="deleteRow(scope.$index)"
-                type="text"
-                icon="el-icon-close"
-                size="big"
-              ></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure">确认新增</el-button>
-      <el-button type="primary" @click="cancel">返回</el-button>
+      <el-button type="primary" @click="makeSure">保存</el-button>
+    </div>
+    <div>
+      <mergeRowTable v-bind.sync="first" ref="table"> </mergeRowTable>
     </div>
   </div>
 </template>
@@ -123,6 +102,7 @@
 import PageTitle from '@/components/Page/Title'
 import { sjTime } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
+import { isNumber } from '../../../ADMINISTRATORS/app'
 export default {
   components: { PageTitle },
   data() {
@@ -135,8 +115,10 @@ export default {
       type: null,
       model: null,
       capacityId: null,
+      capacityNumber: null,
       loadPoint: null,
       unloadPoint: null,
+      count: null,
       options: [
         {
           value: '甲'
@@ -146,6 +128,9 @@ export default {
         },
         {
           value: '丙'
+        },
+        {
+          value: '丁'
         }
       ],
       options1: [
@@ -203,15 +188,14 @@ export default {
           value: 'Φ40'
         }
       ],
-      tableTop: [
-        {
-          prop: 'capacityNumber',
-          label: '车牌号'
-        }
-      ],
-      selectionList: [],
+      optionsCapacity: [],
       optionsLoad: [],
-      optionsUnload: []
+      optionsUnload: [],
+      capacityIds: [],
+      first: {
+        // first请求数据的地址
+        requestUrl: ''
+      }
     }
   },
   mounted() {
@@ -220,6 +204,18 @@ export default {
     this.getUnloadPoint()
     this.getCapacity()
   },
+  created() {
+    if (
+      getCookie('orgCode') == 'dagangadmin' ||
+      getCookie('orgCode') == 'zidonghuabu'
+    ) {
+      this.first.requestUrl = '/api/v1/ams/getBilletRequirementList?apiId=518'
+    } else {
+      this.first.requestUrl =
+        '/api/v1/ams/getBilletRequirementList?apiId=518&orgCode=' +
+        getCookie('orgCode')
+    }
+  },
   methods: {
     resetCapacity() {
       this.getCapacity()
@@ -270,42 +266,69 @@ export default {
         .then(res => {
           if (res.data.code == '200') {
             //过滤
-            this.selectionList = res.data.data.list
+            let arr = []
+            // this.selectionList = res.data.data.list
+            res.data.data.list.forEach(e => {
+              let map = {}
+              map.capacityNumber = e.capacityNumber
+              map.capacityId = e.capacityId
+              arr.push(map)
+            })
+            this.optionsCapacity = Array.from(arr)
+            console.log(this.optionsCapacity)
+            // console.log(Array.from(this.optionsCapacity))
             // console.log(res.data.data.list)
           }
         })
     },
     // 新增
     makeSure() {
+      let capacityList = []
+      this.capacityIds.forEach(e => {
+        let map = {}
+        map.capacityId = e
+        capacityList.push(map)
+      })
       let map = {
         requirementShipperId: this.requireUnitId,
         heatNo: this.heatNo,
         requirementType: '计重',
         clazz: this.clazz,
-        requirementType: this.type,
+        type: this.type,
         model: this.model,
         requirementPlatformId: this.loadPoint,
         requirementUnloadUnitId: this.unloadPoint,
-        capacityList: this.selectionList
+        capacityList: capacityList,
+        count: this.count,
+        orgCode: getCookie('orgCode')
       }
       console.log('map:', map)
       if (
-        !map.requireUnitId ||
+        !map.requirementShipperId ||
         !map.heatNo ||
         !map.requirementType ||
         !map.clazz ||
         !map.type ||
         !map.model ||
-        !map.loadPoint ||
-        !map.unloadPoint ||
+        !map.requirementPlatformId ||
+        !map.requirementUnloadUnitId ||
+        !map.count ||
         map.capacityList.length <= 0
       ) {
         this.$message.warning('每项都为必填！')
         return
       }
+      if (!isNumber(map.count)) {
+        this.$message.error('支数不为整数！')
+        return
+      } else if (map.count > 25) {
+        this.$message.error('支数必须小于等于25支')
+        return
+      }
       //提交
-      this.axios.post('', map).then(res => {
+      this.axios.post('/api/v1/ams/addBilletRequirement', map).then(res => {
         if (res.data.code == '200') {
+          this.$message.success('派发成功!')
         }
       })
     },

src/views/inward/components/inwardBillet/inwardBillet.vue

@@ -23,57 +23,31 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="toInsert2"
-        v-if="activeName == 'first'"
-      >
+      <el-button type="primary" class="btn" @click="toInsert2">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
     <template>
       <div>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="未下发" name="first">
-            <mergeRowTable
-              v-bind.sync="first"
-              @selection-change="selectionChange"
-              ref="table"
-            >
-              <el-table-column fixed="right" label="操作" width="80">
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="deleteRequirement(scope)"
-                  >
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </mergeRowTable>
-          </el-tab-pane>
-          <el-tab-pane label="已下发" name="second">
-            <mergeRowTable
-              v-bind.sync="second"
-              ref="table1"
-              :isPagination="false"
-              :pageSize="2000"
-            >
-              <el-table-column fixed="right" label="操作" width="80">
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="getRequirementOrder(scope)"
-                    >运单</el-button
-                  >
-                </template>
-              </el-table-column>
-            </mergeRowTable>
-          </el-tab-pane>
-        </el-tabs>
+        <mergeRowTable v-bind.sync="first" ref="table">
+          <el-table-column fixed="right" label="操作" width="80">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="mini"
+                @click="closeRequirement(scope)"
+              >
+                停止
+              </el-button>
+              <el-button
+                type="text"
+                size="mini"
+                @click="getRequirementOrder(scope)"
+                >运单</el-button
+              >
+            </template>
+          </el-table-column>
+        </mergeRowTable>
       </div>
     </template>
   </div>
@@ -90,25 +64,8 @@ export default {
       endTime: null,
       first: {
         // first请求数据的地址
-        requestUrl: '',
-        selectionType: 'select',
-        columnIndexs: [0, 1, 2, 6, 7, 8, 9, 22],
-        comparison: 'requirementNumber',
-        mapList: []
-      },
-      second: {
-        columnIndexs: [0, 1, 5, 6, 7, 8, 9, 21],
-        comparison: 'requirementNumber',
-        // second请求数据的地址
         requestUrl: ''
-      },
-      tableData: [],
-      tableData1: [
-        {
-          materialCount: 100
-        }
-      ],
-      activeName: 'first'
+      }
     }
   },
   created() {
@@ -116,16 +73,10 @@ export default {
       getCookie('orgCode') == 'dagangadmin' ||
       getCookie('orgCode') == 'zidonghuabu'
     ) {
-      this.first.requestUrl =
-        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0'
-      this.second.requestUrl =
-        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1'
+      this.first.requestUrl = '/api/v1/ams/getBilletRequirementList?apiId=518'
     } else {
       this.first.requestUrl =
-        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
-        getCookie('orgCode')
-      this.second.requestUrl =
-        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
+        '/api/v1/ams/getBilletRequirementList?apiId=518&orgCode=' +
         getCookie('orgCode')
     }
   },
@@ -145,31 +96,17 @@ export default {
       ) {
         orgCode = getCookie('orgCode')
       }
-      if (this.activeName == 'first') {
-        this.first.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
-          orgCode +
-          '&index=' +
-          this.inputText +
-          '&startTime=' +
-          startTime +
-          '&endTime=' +
-          endTime +
-          '&i=' +
-          new Date()
-      } else {
-        this.second.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
-          orgCode +
-          '&index=' +
-          this.inputText +
-          '&startTime=' +
-          startTime +
-          '&endTime=' +
-          endTime +
-          '&i=' +
-          new Date()
-      }
+      this.first.requestUrl =
+        '/api/v1/ams/getBilletRequirementList?apiId=518&requirementStatus=0&orgCode=' +
+        orgCode +
+        '&index=' +
+        this.inputText +
+        '&startTime=' +
+        startTime +
+        '&endTime=' +
+        endTime +
+        '&i=' +
+        new Date()
     },
     //查看需求下面的运单
     getRequirementOrder(scope) {
@@ -184,35 +121,21 @@ export default {
         getCookie('orgCode') == 'zidonghuabu'
       ) {
         this.first.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=' +
-          new Date()
-        this.second.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=' +
+          '/api/v1/ams/getBilletRequirementList?apiId=518&requirementStatus=0&i=' +
           new Date()
       } else {
         this.first.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
-          getCookie('orgCode') +
-          '&i=' +
-          new Date()
-        this.second.requestUrl =
-          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
+          '/api/v1/ams/getBilletRequirementList?apiId=518&requirementStatus=0&orgCode=' +
           getCookie('orgCode') +
           '&i=' +
           new Date()
       }
     },
-    selectionChange(selection) {
-      this.first.mapList = selection
-    },
     toInsert2() {
       this.$router.push('/addInwardBillet')
     },
-    updateRequirement(scope) {
-      this.$router.push('/updateRequirement/' + scope.row.requirementId)
-    },
-    deleteRequirement(scope) {
-      this.$confirm('是否删除', '提示', {
+    closeRequirement(scope) {
+      this.$confirm('是否停止转运', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -221,18 +144,19 @@ export default {
         .then(() => {
           this.axios
             .post(
-              '/api/v1/ams/deleteTruckRequirement/' + scope.row.requirementId
+              '/api/v1/ams/closeDueDate?requirementId=' +
+                scope.row.requirementId
             )
             .then(res => {
               if (res.data.code == 200) {
                 this.$message({
                   type: 'success',
-                  message: '删除成功!'
+                  message: '停止成功!'
                 })
                 this.getRequestUrl()
               } else {
                 this.$message({
-                  message: '删除失败',
+                  message: '停止失败',
                   type: 'warning'
                 })
               }
@@ -244,45 +168,6 @@ export default {
             message: '删除操作已取消!'
           })
         })
-    },
-    Issue() {
-      console.log(this.first.mapList)
-      if (this.first.mapList.length == 0) {
-        this.$message.warning('请选择需求')
-        return
-      }
-      // 权限控制，判断用户是否属于轧钢厂下面的车间
-      this.$confirm('是否下发', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        center: true
-      })
-        .then(() => {
-          this.axios
-            .post('/api/v1/ams/downRequirement', this.first.mapList)
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: 'success',
-                  message: '下发成功!'
-                })
-                this.getRequestUrl()
-                this.activeName = 'second'
-              } else {
-                this.$message({
-                  message: '下发失败',
-                  type: 'warning'
-                })
-              }
-            })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '取消下发!'
-          })
-        })
     }
   }
 }

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

@@ -269,6 +269,7 @@
         </el-table-column>
         <el-table-column
           prop="outGateTime"
+          column-key="outGateTimeList"
           label="出厂时间"
           width="130px"
           show-overflow-tooltip
@@ -568,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">
@@ -848,7 +854,9 @@ export default {
         '司机电话',
         '运输订单号',
         '签收地址',
+        '签收时间',
         '抵达地址',
+        '抵达时间',
         '出厂时间',
         '进厂时间',
         '运单状态',
@@ -972,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) {
@@ -1033,20 +1056,12 @@ export default {
       let consigneeNameList = this.tableData.map(e => {
         return e.consigneeName
       })
-      let carrierNameList = this.tableData
-        .map(e => {
-          return e.carrierName
-        })
-        .filter(e => {
-          return e != null
-        })
-      let capacityList = this.tableData
-        .map(e => {
-          return e.capacityNo
-        })
-        .filter(e => {
-          return e != null
-        })
+      let carrierNameList = this.tableData.map(e => {
+        return e.carrierName
+      })
+      let capacityList = this.tableData.map(e => {
+        return e.capacityNo
+      })
       let materialNameList = this.tableData
         .map(e => {
           return e.materialName
@@ -2197,6 +2212,10 @@ export default {
           margin-left: 50px;
           margin-right: 10px;
         }
+        .steelMapClass44 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
       }
       .steelMapClass5 {
         margin-top: 20px;