修改

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','ADMINISTRATORS']
-// let devModules = ['index', 'statisticalReport', 'appoint', 'queue']
+// let devModules = ['index', 'queue']
 let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/appoint/components/saleContract/saleOrderCoproduct.vue

@@ -113,50 +113,50 @@
   </div>
 </template>
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
-  name: "saleOrder",
+  name: 'saleOrder',
   data() {
     return {
       startTime: null,
       endTime: null,
-      activeName: "four",
+      activeName: 'four',
       drawer: false,
-      input: "",
-      index: "",
+      input: '',
+      index: '',
       carrierId: null,
       carrierName: null,
       option4: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getFuSaleOrderList?apiId=481" + "&deleted=" + Number(0),
-        selectionType: "select",
-        comparison: "saleNumber",
+          '/api/v1/ams/getFuSaleOrderList?apiId=481' + '&deleted=' + Number(0),
+        selectionType: 'select',
+        comparison: 'saleNumber',
         columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       option: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getFuSaleOrderList?apiId=481&deleted=" + Number(2),
-        comparison: "saleNumber",
+          '/api/v1/ams/getFuSaleOrderList?apiId=481&deleted=' + Number(2),
+        comparison: 'saleNumber',
         columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       carrier: {
-        requestUrl: "",
-        selectionType: "radio"
+        requestUrl: '',
+        selectionType: 'radio'
       },
       mapList: [],
       mapItemList: []
-    };
+    }
   },
   methods: {
     deleteSaleOrder(row) {
-      this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        inputPlaceholder: "请输入关闭原因-必填！！！",
+      this.$prompt('此操作将关闭订单且下面的待运输订单，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入关闭原因-必填！！！',
         center: true,
-        type: "warning"
+        type: 'warning'
       })
         .then(({ value }) => {
           if (value != null) {
@@ -164,110 +164,112 @@ export default {
               number: row.saleNumber,
               saleOrderId: row.saleOrderId,
               reason: value
-            };
+            }
             this.axios
-              .post("/api/v1/ams/deleteSaleOrderSame", mapValue)
+              .post(
+                '/api/v1/ams/deleteSaleOrderById?saleOrderId=' + row.saleOrderId
+              )
               .then(res => {
                 if (res.data.code == 200) {
-                  this.$message.success("关闭成功");
-                  this.refresh();
+                  this.$message.success('关闭成功')
+                  this.onclick()
                 }
-              });
+              })
           } else {
-            this.$message.error("请输入理由");
+            this.$message.error('请输入理由')
           }
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "取消输入"
-          });
-        });
+            type: 'info',
+            message: '取消输入'
+          })
+        })
     },
     checkSaleOrderDetails(saleOrderId) {
-      console.log(saleOrderId);
-      this.$router.push("saleOrderOODetails/" + saleOrderId);
+      console.log(saleOrderId)
+      this.$router.push('saleOrderOODetails/' + saleOrderId)
     },
     refresh() {
       this.option4.requestUrl =
-        "/api/v1/ams/getFuSaleOrderList?apiId=481&i=" +
+        '/api/v1/ams/getFuSaleOrderList?apiId=481&i=' +
         new Date() +
-        "&deleted=" +
-        Number(0);
+        '&deleted=' +
+        Number(0)
       this.option.requestUrl =
-        "/api/v1/ams/getFuSaleOrderList?apiId=481&i=" +
+        '/api/v1/ams/getFuSaleOrderList?apiId=481&i=' +
         new Date() +
-        "&deleted=" +
-        Number(2);
+        '&deleted=' +
+        Number(2)
     },
     handleClick(tab, event) {},
     onclick() {
-      let startTime = null;
-      let endTime = null;
+      let startTime = null
+      let endTime = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (this.activeName == "four") {
+      if (this.activeName == 'four') {
         this.option4.requestUrl =
-          "/api/v1/ams/getFuSaleOrderList?apiId=481&con=" +
+          '/api/v1/ams/getFuSaleOrderList?apiId=481&con=' +
           this.input +
-          "&deleted=" +
+          '&deleted=' +
           Number(0) +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       } else {
         this.option.requestUrl =
-          "/api/v1/ams/getFuSaleOrderList?apiId=481&con=" +
+          '/api/v1/ams/getFuSaleOrderList?apiId=481&con=' +
           this.input +
-          "&deleted=" +
+          '&deleted=' +
           Number(2) +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       }
     },
     //模糊查询承运商
     onclickCarrier() {
       this.carrier.requestUrl =
-        "/api/v1/uc/getCarrierListByLike?apiId=412&index=" +
+        '/api/v1/uc/getCarrierListByLike?apiId=412&index=' +
         this.index +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     selectionChange(selection) {
-      this.mapList = [];
-      this.mapList = selection;
+      this.mapList = []
+      this.mapList = selection
     },
     currentRadioChange(row) {
-      (this.carrierId = row.carrierId), (this.carrierName = row.carrierName);
+      ;(this.carrierId = row.carrierId), (this.carrierName = row.carrierName)
     },
     empower() {
       if (this.mapList.length == 0) {
-        this.$message.warning("请先选择至少一个销售订单");
+        this.$message.warning('请先选择至少一个销售订单')
       } else {
         this.carrier.requestUrl =
-          "/api/v1/uc/getCarrierListByLike?apiId=412&i=" + new Date();
-        this.drawer = true;
+          '/api/v1/uc/getCarrierListByLike?apiId=412&i=' + new Date()
+        this.drawer = true
       }
     },
     selectMakeSure() {
-      this.index = null;
-      this.drawer = false;
+      this.index = null
+      this.drawer = false
       this.$confirm(
-        "是否确认授权选中的销售订单给承运商:(" + this.carrierName + ")",
-        "提示",
+        '是否确认授权选中的销售订单给承运商:(' + this.carrierName + ')',
+        '提示',
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
           center: true
         }
       )
@@ -277,43 +279,43 @@ export default {
             var mapItem = {
               //销售订单id
               saleOrderId: 0
-            };
-            mapItem.saleOrderId = item.saleOrderId;
-            this.mapItemList = [];
-            this.mapItemList.push(mapItem);
-          });
+            }
+            mapItem.saleOrderId = item.saleOrderId
+            this.mapItemList = []
+            this.mapItemList.push(mapItem)
+          })
           //初始化传递的参数
           let mapValue = {
             saleOrderIds: this.mapItemList,
             carrierId: this.carrierId
-          };
+          }
           this.axios
-            .post("/api/v1/ams/saleOrderEmpowerCarrier", mapValue)
+            .post('/api/v1/ams/saleOrderEmpowerCarrier', mapValue)
             .then(res => {
-              if (res.data.code == "0") {
-                this.$message({ type: "success", message: "授权成功!" });
-                this.refresh();
+              if (res.data.code == '0') {
+                this.$message({ type: 'success', message: '授权成功!' })
+                this.refresh()
               }
-            });
+            })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "取消授权!"
-          });
-        });
+            type: 'info',
+            message: '取消授权!'
+          })
+        })
     },
     seeclick(saleOrderId) {
-      this.$router.push("/saleOrderDetail/" + saleOrderId);
+      this.$router.push('/saleOrderDetail/' + saleOrderId)
     },
     click(saleOrderId) {
-      this.$router.push("/editSaleOrder/" + saleOrderId);
+      this.$router.push('/editSaleOrder/' + saleOrderId)
     },
     coproductSendClick(saleOrderId) {
-      this.$router.push("/addSaleOrderCoproductSend/" + saleOrderId);
+      this.$router.push('/addSaleOrderCoproductSend/' + saleOrderId)
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .salePlan {

src/views/index/components/login.vue

@@ -107,13 +107,16 @@ export default {
           this.loginBtnLoading = true
           let form = JSON.parse(JSON.stringify(this.loginForm))
           form.app_code = 'web' //终端code暂时写死
+          //传递密码明文进去
           this.shaObj.update(form.password)
-          console.log(form.password)
+          console.log(form)
+          //获得密码的哈希值
           form.password = this.shaObj.getHash('HEX')
           console.log(form.password)
           this.store
             .dispatch('index/login/login', form)
             .then(res => {
+              console.log(res)
               if (res.code === '0') {
                 console.log('login resonse', res.data)
                 //  登录成功
@@ -132,7 +135,6 @@ export default {
                 setCookie('loginName', this.loginForm.loginName)
                 let info = JSON.parse(JSON.stringify(res.data.user))
                 for (let k in info) {
-                  console.log('k,', k)
                   if (
                     k === 'sysGroup' ||
                     k === 'sysCompanys' ||
@@ -148,8 +150,6 @@ export default {
                 // 判断用户集团公司情况跳转
                 let userInfo = res.data.user
                 let sRedirect = this.$route.query.redirect
-                console.log(userInfo)
-                console.log('userInfo')
                 // 超级管理员
                 if (userInfo.userCode === 'admin') {
                   if (userInfo.sysCompanys) {
@@ -223,13 +223,13 @@ export default {
                 // 提示
                 this.$message({
                   message: res.message,
-                  type: 'error'
+                  type: 'error',
+                  duration: 2000,
+                  offset: 300
                 })
-              }
-              this.loginBtnLoading = false
-              setTimeout(() => {
+                this.loginBtnLoading = false
                 this.$router.go(0)
-              }, 50)
+              }
             })
             .catch(() => {
               this.loginBtnLoading = false

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

@@ -187,7 +187,12 @@
       <mergeRowTable v-bind.sync="first" ref="table" :isShowGroup="false">
         <el-table-column label="操作" width="80px" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="deleteOrder(scope)" size="mini">
+            <el-button
+              type="text"
+              @click="deleteOrder(scope)"
+              size="mini"
+              v-if="scope.row.orderStatus != '已收货'"
+            >
               删除
             </el-button>
           </template>

src/views/queue/components/qmsEnFacotory/queueFJumpLine.vue

@@ -172,15 +172,15 @@
 export default {
   data() {
     return {
-      capacityNo: "",
-      inputText: "",
+      capacityNo: '',
+      inputText: '',
       optionMa: {
         // 表格请求数据的地址
-        requestUrl: "",
+        requestUrl: '',
         // 控制显示多选列
-        selectionType: "select"
+        selectionType: 'select'
       },
-      activeName: "first",
+      activeName: 'first',
       tableData: [],
       tableData1: [],
       //存放每一行记录的合并数
@@ -198,86 +198,86 @@ export default {
       materialNameText: null,
       materialSpecificationText: null,
       materialModelText: null
-    };
+    }
   },
   watch: {
     activeName() {}
   },
   mounted() {
-    this.getSpellingArray();
-    this.getNoSpellingArray();
+    this.getSpellingArray()
+    this.getNoSpellingArray()
   },
   methods: {
     rowDbClick(row) {
-      this.materialList = [];
-      this.materialList.push(row);
-      this.makeSureMaterial();
+      this.materialList = []
+      this.materialList.push(row)
+      this.makeSureMaterial()
     },
     //物资模态框查询
     onclickMaterial1() {
       this.optionMa.requestUrl =
-        "/api/v1/uc/getSteelMaterial?apiId=244&materialNameText=" +
+        '/api/v1/uc/getSteelMaterial?apiId=244&materialNameText=' +
         this.materialNameText +
-        "&materialSpecificationText=" +
-        this.materialSpecificationText;
+        '&materialSpecificationText=' +
+        this.materialSpecificationText
     },
     onclickMaterial() {
-      this.table1 = true;
+      this.table1 = true
       this.optionMa.requestUrl =
-        "/api/v1/uc/getSteelMaterial?apiId=244&i=" + new Date();
-      console.log("dasd");
+        '/api/v1/uc/getSteelMaterial?apiId=244&i=' + new Date()
+      console.log('dasd')
     },
     //返回选中的物资信息
     selectionChange2(selection) {
-      this.materialList1 = [];
-      this.materialList1 = selection;
-      this.materialList = this.materialList.concat(this.materialList1);
+      this.materialList1 = []
+      this.materialList1 = selection
+      this.materialList = this.materialList.concat(this.materialList1)
     },
     makeSureMaterial() {
-      console.log(this.materialList);
-      var materialIdList = [];
+      console.log(this.materialList)
+      var materialIdList = []
       this.materialList.forEach(e => {
         if (materialIdList.indexOf(e.materialId) == -1) {
-          materialIdList.push(e.materialId);
+          materialIdList.push(e.materialId)
         }
-      });
+      })
       let map = {
         materialList: materialIdList
-      };
-      this.materialList = [];
-      this.materialList1 = [];
-      if (this.activeName == "first") {
+      }
+      this.materialList = []
+      this.materialList1 = []
+      if (this.activeName == 'first') {
         this.axios
-          .post("/api/v1/qms/getQueueListByQueueUp?isSpelling=0", map)
+          .post('/api/v1/qms/getQueueListByQueueUp?isSpelling=0', map)
           .then(res => {
-            this.tableData1 = res.data.data;
-          });
+            this.tableData1 = res.data.data
+          })
       } else {
         this.axios
-          .post("/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1", map)
+          .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1', map)
           .then(res => {
-            this.tableData = res.data.data;
-            this.getSpanArr(this.tableData);
-          });
+            this.tableData = res.data.data
+            this.getSpanArr(this.tableData)
+          })
       }
-      this.table1 = false;
+      this.table1 = false
     },
     //记录每一行的合并数
     getSpanArr(data) {
       //每次调用方法初始化
-      this.spanArr = [];
+      this.spanArr = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
-          this.spanArr.push(1);
-          this.pos = 0;
+          this.spanArr.push(1)
+          this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].resultTotalId === data[i - 1].resultTotalId) {
-            this.spanArr[this.pos] += 1;
-            this.spanArr.push(0);
+            this.spanArr[this.pos] += 1
+            this.spanArr.push(0)
           } else {
-            this.spanArr.push(1);
-            this.pos = i;
+            this.spanArr.push(1)
+            this.pos = i
           }
         }
       }
@@ -293,95 +293,101 @@ export default {
         columnIndex === 10 ||
         columnIndex === 12
       ) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
           colspan: _col
-        };
+        }
       }
     },
     handleClick() {
-      if (this.activeName == "first") {
-        this.getNoSpellingArray();
+      if (this.activeName == 'first') {
+        this.getNoSpellingArray()
       } else {
-        this.getSpellingArray();
+        this.getSpellingArray()
       }
     },
     getNoSpellingArray() {
       this.axios
-        .post("/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=" + new Date())
+        .post('/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=' + new Date())
         .then(res => {
-          this.tableData1 = res.data.data;
-        });
+          this.tableData1 = res.data.data
+        })
     },
     getSpellingArray() {
       this.axios
         .post(
-          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=" +
+          '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
             new Date()
         )
         .then(res => {
-          this.tableData = res.data.data;
-          console.log(this.tableData);
-          this.getSpanArr(this.tableData);
-        });
+          this.tableData = res.data.data
+          console.log(this.tableData)
+          this.getSpanArr(this.tableData)
+        })
     },
     onclick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0?capacityNumber=" +
-          this.capacityNo +
-          "&i=" +
-          new Date();
+      if (this.activeName == 'first') {
+        this.axios
+          .post(
+            '/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=' +
+              new Date() +
+              '&capacityNumber=' +
+              this.capacityNo
+          )
+          .then(res => {
+            this.tableData1 = res.data.data
+          })
+        console.log('wzxxx')
       } else {
         this.axios
           .post(
-            "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=" +
+            '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
               new Date() +
-              "&capacityNumber=" +
+              '&capacityNumber=' +
               this.capacityNo
           )
           .then(res => {
-            this.tableData = res.data.data;
-            this.getSpanArr(this.tableData);
-          });
+            this.tableData = res.data.data
+            this.getSpanArr(this.tableData)
+          })
       }
     },
     handleSelectionChange(selection) {
-      this.maplist = [];
-      this.maplist = selection;
+      this.maplist = []
+      this.maplist = selection
     },
     updateBill(scope) {
-      console.log(scope.row.capacityId);
+      console.log(scope.row.capacityId)
       this.$router.push(
         `/editBill/${scope.row.capacityId}/${scope.row.capacityNumber}`
-      );
+      )
     },
     filterArr(resultId) {
-      console.log("fdhjsaj");
+      console.log('fdhjsaj')
       this.filterArr1 = this.filterArr1.concat(
         this.tableData.filter(ele => ele.resultId == resultId)
-      );
+      )
     },
     allow() {
       if (this.maplist.length == 0) {
-        this.$message.error("请选择需要插队的车辆");
-        return;
+        this.$message.error('请选择需要插队的车辆')
+        return
       }
       let map = {
         mapList: this.maplist
-      };
-      this.axios.post("/api/v1/qms/queueCutInLine", map).then(res => {
-        if (res.data.code == "200") {
-          this.$message.success("插队成功，等待放行");
-          this.getNoSpellingArray();
-          this.getSpellingArray();
+      }
+      this.axios.post('/api/v1/qms/queueCutInLine', map).then(res => {
+        if (res.data.code == '200') {
+          this.$message.success('插队成功，等待放行')
+          this.getNoSpellingArray()
+          this.getSpellingArray()
         }
-      });
+      })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .sale {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -121,6 +121,7 @@
               type="selection"
               width="55"
               reserve-selection
+              :selectable="selectInit"
             ></el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
@@ -356,21 +357,21 @@ export default {
       this.axios.post('/api/v1/qms/ctrlZQueueAllow', map).then(res => {
         if (res.data.code == 200) {
           this.$message({
-            message:"撤销成功",
-            type:'success',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '撤销成功',
+            type: 'success',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
           this.getNoSpellingArray()
           this.getSpellingArray()
         } else {
           this.$message({
-            message:"撤单失败",
-            type:'error',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '撤单失败',
+            type: 'error',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
         }
       })
@@ -521,12 +522,13 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 9 ||
+        columnIndex === 4 ||
         columnIndex === 10 ||
         columnIndex === 11 ||
         columnIndex === 12 ||
         columnIndex === 13 ||
-        columnIndex === 14
+        columnIndex === 14 ||
+        columnIndex === 15
       ) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
@@ -612,14 +614,14 @@ export default {
           }
         }
       }
-      //限制只取第一个去掉
-      // if (
-      //   !this.maplist.some(e => {
-      //     return e.ROW_ID == 1;
-      //   })
-      // ) {
-      //   this.$refs.mutiData.clearSelection();
-      // }
+      // 限制只取第一个去掉
+      if (
+        !this.maplist.some(e => {
+          return e.ROW_ID == 1
+        })
+      ) {
+        this.$refs.mutiData.clearSelection()
+      }
     },
     updateBill(scope) {
       console.log(scope.row.capacityId)
@@ -636,11 +638,11 @@ export default {
     allow() {
       if (this.maplist.length == 0) {
         this.$message({
-          message:"请选择需要放行的车辆",
-          type:'error',
-          duration:2000,
-          center:true,
-          offset:100
+          message: '请选择需要放行的车辆',
+          type: 'error',
+          duration: 2000,
+          center: true,
+          offset: 100
         })
         return
       }
@@ -652,11 +654,11 @@ export default {
           this.maplist[i].id == 'null'
         ) {
           this.$message({
-            message:"请选择装货点",
-            type:'error',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '请选择装货点',
+            type: 'error',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
           return
         }
@@ -666,11 +668,11 @@ export default {
         console.log('warehouse', warehouse)
         if (warehouse && warehouse.carQueue >= 20) {
           this.$message({
-            message:"该仓库已经有20辆车在排队，不允许放行！",
-            type:'error',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '该仓库已经有20辆车在排队，不允许放行！',
+            type: 'error',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
           return
         }
@@ -692,11 +694,11 @@ export default {
       this.axios.post('/api/v1/qms/allowEnFactory', map).then(res => {
         if (res.data.code == '200') {
           this.$message({
-            message:"放行成功，等待进厂",
-            type:'success',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '放行成功，等待进厂',
+            type: 'success',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
           this.maplist = []
           this.$refs.mutiData.clearSelection()
@@ -711,11 +713,11 @@ export default {
           this.start()
         } else {
           this.$message({
-            message:"请按顺序勾选",
-            type:'error',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '请按顺序勾选',
+            type: 'error',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
           this.maplist = []
           this.$refs.mutiData.clearSelection()
@@ -744,19 +746,19 @@ export default {
         console.log(res)
         if (res.data.code == '200') {
           this.$message({
-            message:"更新装货点成功",
-            type:'success',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '更新装货点成功',
+            type: 'success',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
         } else {
           this.$message({
-            message:"更新装货点失败",
-            type:'error',
-            duration:2000,
-            center:true,
-            offset:100
+            message: '更新装货点失败',
+            type: 'error',
+            duration: 2000,
+            center: true,
+            offset: 100
           })
         }
       })

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

@@ -1148,7 +1148,7 @@ export default {
       src2: '',
       isShow2: false,
       input1: '',
-      maxHeight: window.innerHeight - 140,
+      maxHeight: 700,
       //轨迹窗口
       value7: false,
       //实时路径窗口
@@ -1257,28 +1257,28 @@ export default {
               })()
             }
           })
-          this.$refs.tableRef.$el.getElementsByClassName(
-            'el-table__body'
-          )[0].style.top = `${start * this.itemHeight}px`
+          // this.$refs.tableRef.$el.getElementsByClassName(
+          //   'el-table__body'
+          // )[0].style.top = `${start * this.itemHeight}px`
         })
       }
     }
   },
   computed: {},
   mounted() {
-    // window.onresize = () => {
-    //   return (() => {
-    //     console.log('wjll')
-    //     this.maxHeight = window.innerHeight - 150
-    //   })()
-    // }
     let that = this
     window.addEventListener('resize', function() {
-      console.log('wjll')
-      console.log(window)
-
-      that.maxHeight =
-        window.innerHeight - that.$refs.tableRef.$el.offsetTop - 150
+      let timer = null
+      if (timer) clearTimeout(timer)
+      timer = setTimeout(function() {
+        let tableOffsetTop = that.$refs.tableRef.$el.offsetTop
+        console.log(
+          that.$refs.tableRef.$el.offsetTop,
+          'that.$refs.tableRef.$el'
+        )
+        that.maxHeight = window.innerHeight - tableOffsetTop - 20
+        console.log(that.maxHeight, 'maxHeight')
+      }, 5000)
     })
     this.$refs.tableRef.bodyWrapper.addEventListener('scroll', e => {
       if (this.debounceS) return
@@ -1357,10 +1357,10 @@ export default {
         this.$message.warning('该车已有抵达签收实绩，不允许签收')
         return
       }
-      if(row.arrivalAddress){
-        this.location = row.arrivalAddress;
-      }else{
-        this.location = row.addressPlace;
+      if (row.arrivalAddress) {
+        this.location = row.arrivalAddress
+      } else {
+        this.location = row.addressPlace
       }
       this.orderNumber = row.orderNo
       this.capacityNumber = row.capacityNo
@@ -1436,8 +1436,8 @@ export default {
       this.$message.warning('超出上传数量!')
     },
     handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
     },
     closeUpload() {
       this.arrivalReceiving = false
@@ -1666,9 +1666,10 @@ export default {
         column.property == 'arrivalAddress' ||
         column.property == 'receiptAddress'
       ) {
-        return 'color : blue', 'height:30px'
+        return { color: 'blue', height: '30px' }
+      } else {
+        return { height: '30px' }
       }
-      return 'height:30px'
     },
     rowClick(row, column, event) {
       this.steelMap = {}
@@ -2106,7 +2107,12 @@ export default {
         })
         .then(res => {
           if (res.data.code == '200') {
-            this.$message.success('修改成功')
+            this.$message({
+              type: 'success',
+              duration: 2000,
+              message: '修改电话号码成功',
+              offset: 250
+            })
             this.operation(this.steelMap)
             this.getSteelReport()
             loading.close()
@@ -2707,6 +2713,7 @@ export default {
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
+          console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
           loading.close()

src/views/statisticalReport/components/tableItem.vue

@@ -404,10 +404,11 @@ export default {
               })
             })
             //处理打印字符串
-            this.stockString='万港库存：'+this.stockMap.stockTonnage+"吨：";
-            this.stockStringArr.forEach((item)=>{
-              this.stockString+=item.value;
-            });
+            this.stockString =
+              '万港库存：' + this.stockMap.stockTonnage + '吨：'
+            this.stockStringArr.forEach(item => {
+              this.stockString += item.value
+            })
           }
         })
     },
@@ -463,10 +464,11 @@ export default {
             })
           })
           //处理打印字符串
-          this.downStockString='下游港口库存：'+this.downStockMap.downStockTonnage+"吨：";
-          this.downStockStringArr.forEach((item)=>{
-            this.downStockString+=item.value;
-          });
+          this.downStockString =
+            '下游港口库存：' + this.downStockMap.downStockTonnage + '吨：'
+          this.downStockStringArr.forEach(item => {
+            this.downStockString += item.value
+          })
         }
       })
     },
@@ -503,7 +505,7 @@ export default {
             }
           })
           console.log(arr1, 'arr1')
-          let index = 1.1
+          let index = 3.1
           arr1.forEach(e => {
             this.runStockStringArr.push({
               class: 'type',
@@ -520,10 +522,11 @@ export default {
             })
           })
           //处理打印字符串
-          this.runStockString='在途货物：'+this.runStockMap.runStockTonnage+"吨：";
-          this.runStockStringArr.forEach((item)=>{
-            this.runStockString+=item.value;
-          });
+          this.runStockString =
+            '在途货物：' + this.runStockMap.runStockTonnage + '吨：'
+          this.runStockStringArr.forEach(item => {
+            this.runStockString += item.value
+          })
         }
       })
     },