luobang 2 years ago
parent
commit
1c74a6bc1d

+ 1 - 1
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: {

+ 3 - 2
src/views/RMS/components/addCapacity.vue

@@ -2,7 +2,7 @@
   <!-- 添加运力信息 -->
   <div class="addCapacity">
     <PageTitle>返回</PageTitle>
-    <div class="form_box" style="margin-right: 10rem">
+    <div class="form_box" style=" margin-right: 10rem">
       <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
     </div>
     <div class="elForm">
@@ -249,7 +249,8 @@ export default {
         driverLicence: this.driverLicence,
         remark: this.form1.remark,
         carrierId: this.carrierIds,
-        state: this.state
+        state: this.state,
+        capacityTel:this.form1.capacityTel
       };
       console.log(RmsCapacity);
       if (

+ 2 - 1
src/views/RMS/components/addOtherCapacity.vue

@@ -166,7 +166,8 @@ export default {
         capacityBlacklist: this.form1.capacityBlacklist,
         remark: this.form1.remark,
         carrierId: this.carrierIds,
-        state: this.state
+        state: this.state,
+        capacityTel:this.form1.capacityTel
       }
       if (
         RmsCapacity.capacityNumber == null ||

+ 1 - 1
src/views/RMS/components/capacity.vue

@@ -37,7 +37,7 @@
               size="small"
               @click="updateCapacity(scope.row.capacityCarrierId)"
             >
-              修改备注
+              修改
             </el-button>
             <el-button
               type="text"

+ 5 - 3
src/views/RMS/components/editCapacity.vue

@@ -152,11 +152,13 @@ export default {
       let map = {
         remark: this.form1.remark,
         userDep:this.form1.userDep,
-        capacityCarrierId:this.$route.params.capacityCarrierId 
+        capacityCarrierId:this.$route.params.capacityCarrierId,
+        capacityTel:this.form1.capacityTel,
+        capacityNumber:this.form1.capacityNumber
       };
       if (
         map.remark == null ||
-        map.userDep == null 
+        map.userDep == null
       )
         this.$message.error("不能存在空值");
         else
@@ -217,4 +219,4 @@ export default {
     margin-bottom: 1.25rem;
   }
 }
-</style>
+</style>

+ 63 - 9
src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -355,11 +355,23 @@ export default {
       console.log(map)
       this.axios.post('/api/v1/qms/ctrlZQueueAllow', map).then(res => {
         if (res.data.code == 200) {
-          this.$message.success('撤销成功')
+          this.$message({
+            message:"撤销成功",
+            type:'success',
+            duration:2000,
+            center:true,
+            offset:100
+          })
           this.getNoSpellingArray()
           this.getSpellingArray()
         } else {
-          this.$message.error('撤单失败')
+          this.$message({
+            message:"撤单失败",
+            type:'error',
+            duration:2000,
+            center:true,
+            offset:100
+          })
         }
       })
     },
@@ -623,7 +635,13 @@ export default {
     },
     allow() {
       if (this.maplist.length == 0) {
-        this.$message.error('请选择需要放行的车辆')
+        this.$message({
+          message:"请选择需要放行的车辆",
+          type:'error',
+          duration:2000,
+          center:true,
+          offset:100
+        })
         return
       }
       for (let i = 0; i < this.maplist.length; i++) {
@@ -633,7 +651,13 @@ export default {
           this.maplist[i].id == null ||
           this.maplist[i].id == 'null'
         ) {
-          this.$message.error('请选择装货点')
+          this.$message({
+            message:"请选择装货点",
+            type:'error',
+            duration:2000,
+            center:true,
+            offset:100
+          })
           return
         }
         let warehouse = this.tableData3.find(
@@ -641,7 +665,13 @@ export default {
         )
         console.log('warehouse', warehouse)
         if (warehouse && warehouse.carQueue >= 20) {
-          this.$message.error('该仓库已经有20辆车在排队,不允许放行!')
+          this.$message({
+            message:"该仓库已经有20辆车在排队,不允许放行!",
+            type:'error',
+            duration:2000,
+            center:true,
+            offset:100
+          })
           return
         }
         this.filterArr(this.maplist[i].resultId)
@@ -661,7 +691,13 @@ export default {
       }
       this.axios.post('/api/v1/qms/allowEnFactory', map).then(res => {
         if (res.data.code == '200') {
-          this.$message.success('放行成功,等待进厂')
+          this.$message({
+            message:"放行成功,等待进厂",
+            type:'success',
+            duration:2000,
+            center:true,
+            offset:100
+          })
           this.maplist = []
           this.$refs.mutiData.clearSelection()
           this.getNoSpellingArray()
@@ -674,7 +710,13 @@ export default {
           clearInterval(this.timer)
           this.start()
         } else {
-          this.$message.error('请按顺序勾选')
+          this.$message({
+            message:"请按顺序勾选",
+            type:'error',
+            duration:2000,
+            center:true,
+            offset:100
+          })
           this.maplist = []
           this.$refs.mutiData.clearSelection()
           this.getNoSpellingArray()
@@ -701,9 +743,21 @@ export default {
       this.axios.post('/api/v1/qms/modifyLoadWarehouse', map).then(res => {
         console.log(res)
         if (res.data.code == '200') {
-          this.$message.success('更新装货点成功')
+          this.$message({
+            message:"更新装货点成功",
+            type:'success',
+            duration:2000,
+            center:true,
+            offset:100
+          })
         } else {
-          this.$message.error('更新装货点失败')
+          this.$message({
+            message:"更新装货点失败",
+            type:'error',
+            duration:2000,
+            center:true,
+            offset:100
+          })
         }
       })
       //this.axios.post("")