提交代码

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

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

@@ -824,6 +824,7 @@ export default {
             loading.close()
             this.$message.success('新增销售订单成功!')
           } else {
+            console.log(res.data.data)
             this.$message.error(res.data.data)
             this.getRequestUrl()
             loading.close()
@@ -831,8 +832,8 @@ export default {
           }
         })
         .catch(e => {
-          this.$message.error('生成错误!')
           loading.close()
+          this.$message.error('请检查excel格式')
           this.tableData = []
         })
     },

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

@@ -82,10 +82,7 @@
           </el-button>
         </el-form-item>
         <el-form-item v-if="isShowOperate">
-          <el-button
-            type="primary"
-            @click="checkTrans()"
-            v-if="!notRoutList.includes('checkTrans')"
+          <el-button type="primary" @click="checkTrans()"
             ><i class="el-icon-truck"></i>轨迹</el-button
           >
           <el-button type="primary" @click="operation()"
@@ -94,10 +91,7 @@
           <!-- <el-button type="primary" @click="batchoperation()"
             ><i class="el-icon-edit"></i>批量更改</el-button
           > -->
-          <el-button
-            type="primary"
-            @click="checkPoint()"
-            v-if="!notRoutList.includes('checkPoint')"
+          <el-button type="primary" @click="checkPoint()"
             ><i class="el-icon-map-location"></i>实时路径</el-button
           >
         </el-form-item>
@@ -957,15 +951,13 @@
             action="/api/v1/otms/addtmstruckArrivalResult"
             :limit="1"
             :on-change="fileChange1"
+            :on-preview="handlePictureCardPreview"
             :on-exceed="exceed"
             accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF"
             :auto-upload="false"
           >
             <i class="el-icon-plus"></i>
           </el-upload>
-          <el-dialog :visible.sync="dialogVisible1">
-            <img width="100%" :src="dialogImageUrl" alt="" />
-          </el-dialog>
         </el-form-item>
         <el-form-item label="签收图片（空货箱、质保书、签收单）">
           <el-upload
@@ -974,15 +966,13 @@
             action="null"
             :limit="5"
             :on-change="fileChange2"
+            :on-preview="handlePictureCardPreview"
             :on-exceed="exceed"
             accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF"
             :auto-upload="false"
           >
             <i class="el-icon-plus"></i>
           </el-upload>
-          <el-dialog :visible.sync="dialogVisible2">
-            <img width="100%" :src="dialogImageUrl" alt="" />
-          </el-dialog>
         </el-form-item>
       </el-form>
       <el-button
@@ -993,6 +983,9 @@
         >确定</el-button
       >
     </el-dialog>
+    <el-dialog :visible.sync="dialogVisible" width="80%">
+      <img width="100%" :src="dialogImageUrl" alt="" />
+    </el-dialog>
   </div>
 </template>
 
@@ -1196,8 +1189,7 @@ export default {
       fileListArrival: [],
       fileListReceive: [],
       dialogImageUrl: '',
-      dialogVisible1: false,
-      dialogVisible2: false,
+      dialogVisible: false,
       isLoading: false,
       batchList: []
     }
@@ -1250,15 +1242,12 @@ export default {
       immediate: true,
       handler(val) {
         this.$nextTick(() => {
-          console.log(val)
           const start = Math.floor(val / this.itemHeight)
-          console.log(start)
           this.visibleList = []
           this.visibleList = this.tableData.slice(
             start,
             start + Math.floor(this.maxHeight / this.itemHeight) + 1
           )
-          console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
           this.top = start * this.itemHeight
           this.$nextTick(() => {
@@ -1277,12 +1266,19 @@ export default {
   },
   computed: {},
   mounted() {
-    this.$nextTick(() => {
-      window.onresize = () => {
-        return (() => {
-          this.maxHeight = window.innerHeight - 150
-        })()
-      }
+    // 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
     })
     this.$refs.tableRef.bodyWrapper.addEventListener('scroll', e => {
       if (this.debounceS) return
@@ -1439,6 +1435,10 @@ export default {
     exceed() {
       this.$message.warning('超出上传数量!')
     },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
     closeUpload() {
       this.arrivalReceiving = false
       this.$refs.arrival.clearFiles()
@@ -1682,7 +1682,6 @@ export default {
       }
     },
     cellMouse(row, column, cell, event) {
-      console.log(row)
       if (this.isRowClick == 0) {
         this.tableRowIndex = row.group
       }

src/views/statisticalReport/components/tableItem.vue

@@ -366,11 +366,12 @@ export default {
               2
             )}`
             let arr1 = []
+            console.log(res.data.data.list, '万港')
             res.data.data.list.forEach(e => {
               let arr = []
               arr = res.data.data.list
                 .map(e1 => {
-                  if (e1.type == e.type && !arr.includes(e)) {
+                  if (e.type == e1.type && !arr.includes(e)) {
                     return e1
                   }
                 })
@@ -380,7 +381,7 @@ export default {
               if (arr1.length == 0) {
                 arr1.push(arr)
               } else {
-                if (arr1[arr1.length - 1].sort().toString() != arr.toString()) {
+                if (arr1[arr1.length - 1][0]['type'] != arr[0]['type']) {
                   arr1.push(arr)
                 }
               }
@@ -439,7 +440,7 @@ export default {
             if (arr1.length == 0) {
               arr1.push(arr)
             } else {
-              if (arr1[arr1.length - 1].sort().toString() != arr.toString()) {
+              if (arr1[arr1.length - 1][0]['type'] != arr[0]['type']) {
                 arr1.push(arr)
               }
             }
@@ -496,7 +497,7 @@ export default {
             if (arr1.length == 0) {
               arr1.push(arr)
             } else {
-              if (arr1[arr1.length - 1].sort().toString() != arr.toString()) {
+              if (arr1[arr1.length - 1][0]['type'] != arr[0]['type']) {
                 arr1.push(arr)
               }
             }