luobang 2 jaren geleden
bovenliggende
commit
df702d6b67

+ 1 - 0
src/assets/css/el/el-table.css

@@ -35,6 +35,7 @@
 
 .el-table thead {
     color: #fff;
+    font-weight: 900;
 }
 
 .el-table td {

+ 9 - 7
src/assets/json/element_css.js

@@ -1,5 +1,6 @@
 let elementCssJson = {
-    'element_css': `.el-input__suffix,
+  element_css:
+    `.el-input__suffix,
     .el-tree.is-dragging .el-tree-node__content * {
       pointer-events: none
     }
@@ -2355,9 +2356,9 @@ let elementCssJson = {
       box-sizing: border-box
     }
     
-    .el-table th>.cell.highlight {
-      color: #409EFF
-    }
+    // .el-table th>.cell.highlight {
+    //   color: #409EFF
+    // }
     
     .el-table th.required>div::before {
       display: inline-block;
@@ -13584,6 +13585,7 @@ let elementCssJson = {
     
     .el-table thead {
         color: #fff;
+        font-Weight:900 !important
     }
     
     .el-table td {
@@ -13598,9 +13600,9 @@ let elementCssJson = {
         background: #ccf1ff
     }
     
-    .el-table th>.cell.highlight {
-        color: #ffffff
-    }
+    // .el-table th>.cell.highlight {
+    //     color: #ffffff
+    // }
     
     .el-table .cell {
     padding: 0 5px !important;

+ 166 - 89
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -79,6 +79,11 @@
             >下载Excel</el-button
           >
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="clearFilter"
+            >清除所有筛选</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="refresh">
             <i class="el-icon-refresh"></i>
@@ -168,6 +173,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-form-item>
+
         <el-form-item>
           <span style="width: auto;font-size: 16px;line-height: auto;"
             >车数/件数: {{ totalCapacity }}/{{ totalNumber }}
@@ -194,9 +200,9 @@
         :key="saleSteelKey"
         id="salesLogisticsStat_saleSteelReports_table"
         individual-panel
-        @resetTable="reset"
         @select="selectOne"
         @selection-change="handleSelectionChange()"
+        :header-cell-style="headCellStyle"
       >
         <el-table-column
           type="selection"
@@ -300,6 +306,7 @@
         >
         </el-table-column>
         <el-table-column
+          className="xxxx_capacityNo"
           prop="capacityNo"
           column-key="capacityNo"
           key="capacityNo"
@@ -945,16 +952,22 @@
                 steelMap.orderNo != null && !notRoutList.includes('closeOrder')
               "
             >
-              <el-input
-                v-model="steelMap.remark"
-                placeholder="填写备注"
-                class="steelMapClass921"
-              >
-                <template slot="prepend">备注</template>
+              <el-form :inline="true">
+                <el-form-item>
+                  <el-input
+                    v-model="steelMap.remark"
+                    placeholder="填写备注"
+                    class="steelMapClass921"
+                    type="textarea"
+                    autosize
+                  >
+                    <!-- <template slot="prepend">备注</template>
                 <template slot="prefix">
                   {{ steelMap.remark }}
-                </template>
-              </el-input>
+                </template> -->
+                  </el-input></el-form-item
+                >
+              </el-form>
             </div>
           </div>
           <div class="steelMapClass5">
@@ -1609,7 +1622,6 @@ import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
 import { downloadFile, creatImageFile } from '@/utils/base64ToBlob.js'
 import Qrcode from 'qrcodejs2'
-import steel_outboundStatisticsVue from '../../../WMS/components/steel/steel_outboundStatistics.vue'
 export default {
   components: {
     PathView,
@@ -1876,7 +1888,16 @@ export default {
       filterCarrierList: [],
       filterCapacityList: [],
       filtermaterialNameList: [],
-      filterorderStatus: [],
+      filterorderStatus: [
+        { text: '未派发', value: '未派发' },
+        { text: '已派单', value: '已派单' },
+        { text: '已接单', value: '已接单' },
+        { text: '排队中', value: '排队中' },
+        { text: '已进厂', value: '已进厂' },
+        { text: '已出厂', value: '已出厂' },
+        { text: '已完成', value: '已完成' },
+        { text: '已关闭', value: '已关闭' }
+      ],
       filteraddressPlace: [],
       filtermaterialSpe: [],
       filterSaleRemark: [],
@@ -1958,7 +1979,8 @@ export default {
       scrollUpdateSelectFlag: 0,
       scrollLeft: 0,
       scrollLeftFlag: 0,
-      isShowOperateYeWuYuan: false
+      isShowOperateYeWuYuan: false,
+      headColumnList: []
     }
   },
   created() {
@@ -2130,6 +2152,22 @@ export default {
   },
   computed: {},
   methods: {
+    headCellStyle({ row, column, rowIndex, columnIndex }) {
+      // console.log(row, 'row')
+      // console.log('headCellStyle column.property: ', column.property)
+      if (column.property && this.headColumnList.includes(column.property)) {
+        console.log(this.headColumnList, 'this.headColumnList', column.property)
+        return { color: 'red !important', fontWeight: 700, fontSize: '15px' }
+        //return {}
+      }
+      return {}
+    },
+    clearFilter() {
+      this.$refs.tableRef.clearFilter()
+      this.headColumnList = []
+      this.filterMap = {}
+      this.onclick()
+    },
     creatQrCode(text) {
       let qrcode = new QRCode(this.$refs.qrCodeUrl, {
         text: text, // 需要转换为二维码的内容
@@ -2162,7 +2200,6 @@ export default {
             })
           }
           if (res.data.response.length == 0) {
-            console.log('我尽力了1')
             setTimeout(() => {
               _this.$message({
                 type: 'success',
@@ -2172,7 +2209,6 @@ export default {
               })
             }, 2500)
           } else {
-            console.log('我尽力了2')
             let responseTitle = res.data.response.join(';')
             setTimeout(() => {
               _this.$message({
@@ -2184,7 +2220,7 @@ export default {
             }, 2500)
           }
           this.operation(this.steelMap)
-          this.getSteelReport()
+          this.onclick(this.filterMap)
         })
       })
     },
@@ -2268,7 +2304,7 @@ export default {
           }
         })
         this.batchCarrierVisible = false
-        this.getSteelReport()
+        this.onclick(this.filterMap)
       } else {
         this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
       }
@@ -2303,7 +2339,7 @@ export default {
               duration: '2500'
             })
             this.exceptionHandleVisible = false
-            this.getSteelReport()
+            this.onclick(this.filterMap)
           })
       }
     },
@@ -2402,7 +2438,7 @@ export default {
             .post('/api/v1/ams/splitOrder', map)
             .then(res => {
               if (res.data.code == '200') {
-                this.getSteelReport()
+                this.onclick(this.filterMap)
                 this.$message({
                   type: 'success',
                   message: '拆分成功',
@@ -2465,7 +2501,7 @@ export default {
             .post('/api/v1/ams/mergeOrder', map)
             .then(res => {
               if (res.data.code == '200') {
-                this.getSteelReport()
+                this.onclick(this.filterMap)
                 this.$message({
                   type: 'success',
                   message: '合并成功,请提醒驾驶员!',
@@ -2609,7 +2645,7 @@ export default {
                   })
                   .then(res => {
                     if (res.data.code == '200') {
-                      this.getSteelReport()
+                      this.onclick(this.filterMap)
                       this.$message({
                         type: 'success',
                         offset: '250',
@@ -2684,14 +2720,14 @@ export default {
             this.batchCarrierList = []
             this.batchCarrierVisible = false
             this.batchCarrierName = null
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           } else {
             this.$message.error('授权失败,请联系管理员')
             this.batchCarrierList = []
             this.batchCarrierVisible = false
             this.batchCarrierName = null
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           }
         })
@@ -2699,7 +2735,7 @@ export default {
           this.$message.error('授权失败,请联系管理员')
           this.batchCarrierList = []
           this.batchCarrierVisible = false
-          this.getSteelReport()
+          this.onclick(this.filterMap)
           loading.close()
         })
     },
@@ -2920,13 +2956,19 @@ export default {
     //筛选
     filterChange(obj) {
       //承运商筛选,后续有待优化
+      console.log(obj, 'filterChange obj', arguments)
       if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
+        this.headColumnList.push('carrierName')
         this.filterMap.carrierList = obj.carrierList
       }
       if (
         typeof obj.carrierList != 'undefined' &&
         obj.carrierList.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('carrierName'),
+          1
+        )
         delete this.filterMap.carrierList
       }
       //物资名称筛选,后续有待优化
@@ -2934,19 +2976,26 @@ export default {
         typeof obj.materialNameList != 'undefined' &&
         obj.materialNameList.length > 0
       ) {
+        this.headColumnList.push('materialName')
         this.filterMap.materialNameList = obj.materialNameList
       }
       if (
         typeof obj.materialNameList != 'undefined' &&
         obj.materialNameList.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('materialName'),
+          1
+        )
         delete this.filterMap.materialNameList
       }
       //车牌号筛选,后续有待优化
       if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length > 0) {
         this.filterMap.capacityList = obj.capacityNo
+        this.headColumnList.push('capacityNo')
       }
       if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length == 0) {
+        this.headColumnList.splice(this.headColumnList.indexOf('capacityNo'), 1)
         delete this.filterMap.capacityList
       }
       //客户筛选,后续有待优化
@@ -2954,12 +3003,17 @@ export default {
         typeof obj.consigneeName != 'undefined' &&
         obj.consigneeName.length > 0
       ) {
+        this.headColumnList.push('consigneeName')
         this.filterMap.consigneeNameList = obj.consigneeName
       }
       if (
         typeof obj.consigneeName != 'undefined' &&
         obj.consigneeName.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('consigneeName'),
+          1
+        )
         delete this.filterMap.consigneeNameList
       }
       //销售片区筛选,后续有待优化
@@ -2977,12 +3031,17 @@ export default {
       }
       //物资规格筛选
       if (typeof obj.materialSpe != 'undefined' && obj.materialSpe.length > 0) {
+        this.headColumnList.push('materialSpe')
         this.filterMap.materialSpeList = obj.materialSpe
       }
       if (
         typeof obj.materialSpe != 'undefined' &&
         obj.materialSpe.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('materialSpe'),
+          1
+        )
         delete this.filterMap.materialSpeList
       }
       //收货地址筛选
@@ -2990,39 +3049,57 @@ export default {
         typeof obj.addressPlace != 'undefined' &&
         obj.addressPlace.length > 0
       ) {
+        this.headColumnList.push('addressPlace')
         this.filterMap.addressPlaceList = obj.addressPlace
       }
       if (
         typeof obj.addressPlace != 'undefined' &&
         obj.addressPlace.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('addressPlace'),
+          1
+        )
         delete this.filterMap.addressPlaceList
       }
       if (typeof obj.orderStatus != 'undefined' && obj.orderStatus.length > 0) {
+        this.headColumnList.push('orderStatus')
+        // this.reset()
         this.filterMap.orderStatusList = obj.orderStatus
       }
       if (
         typeof obj.orderStatus != 'undefined' &&
         obj.orderStatus.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('orderStatus'),
+          1
+        )
         delete this.filterMap.orderStatusList
       }
       if (
         typeof obj.saleOrderStatus != 'undefined' &&
         obj.saleOrderStatus.length > 0
       ) {
+        this.headColumnList.push('saleOrderStatus')
         this.filterMap.saleOrderStatusList = obj.saleOrderStatus
       }
       if (
         typeof obj.saleOrderStatus != 'undefined' &&
         obj.saleOrderStatus.length == 0
       ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('saleOrderStatus'),
+          1
+        )
         delete this.filterMap.saleOrderStatusList
       }
       if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length > 0) {
+        this.headColumnList.push('saleRemark')
         this.filterMap.saleRemarkList = obj.saleRemark
       }
       if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length == 0) {
+        this.headColumnList.splice(this.headColumnList.indexOf('saleRemark'), 1)
         delete this.filterMap.saleRemarkList
       }
       // if (obj)
@@ -3260,7 +3337,7 @@ export default {
         .post('/api/v1/ams/reverseCloseOrder', this.steelMap)
         .then(res => {
           this.operation(this.steelMap)
-          this.getSteelReport()
+          this.onclick(this.filterMap)
         })
     },
     //筛选
@@ -3377,16 +3454,16 @@ export default {
             if (res.data.code == '200') {
               this.$message.success('反关闭成功')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
             } else {
               this.$message.error('反关闭失败')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
             }
           })
           .catch(() => {
             this.$message.error('反关闭失败')
-            this.getSteelReport()
+            this.onclick(this.filterMap)
           })
       })
     },
@@ -3585,7 +3662,7 @@ export default {
               //       }
               //     })
               // }
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             } else {
               this.$alert(res.data.data, '提示', {
@@ -3593,7 +3670,7 @@ export default {
                 center: true,
                 type: 'warning',
                 callback: action => {
-                  this.getSteelReport()
+                  this.onclick(this.filterMap)
                   this.operation(this.steelMap)
                 }
               })
@@ -3637,7 +3714,7 @@ export default {
                   //   this.updateDriverTel()
                   // }
                 })
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             } else {
               loading.close()
@@ -3645,7 +3722,7 @@ export default {
                 confirmButtonText: '确定',
                 center: true,
                 callback: action => {
-                  this.getSteelReport()
+                  this.onclick(this.filterMap)
                   this.operation(this.steelMap)
                 }
               })
@@ -3654,7 +3731,7 @@ export default {
           .catch(() => {
             this.$message.error(res.data.data)
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           })
       }
@@ -3696,19 +3773,19 @@ export default {
               offset: 250
             })
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           } else {
             this.$message.error('修改失败')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           }
         })
         .catch(() => {
           this.$message.error('修改失败')
           this.operation(this.steelMap)
-          this.getSteelReport()
+          this.onclick(this.filterMap)
           loading.close()
         })
     },
@@ -3737,19 +3814,19 @@ export default {
           if (res.data.code == '200') {
             this.$message.success('修改成功')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           } else {
             this.$message.error('修改失败')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           }
         })
         .catch(() => {
           this.$message.error('修改失败')
           this.operation(this.steelMap)
-          this.getSteelReport()
+          this.onclick(this.filterMap)
           loading.close()
         })
     },
@@ -3784,7 +3861,7 @@ export default {
             this.$message.error('修改失败')
           })
       })
-      this.getSteelReport()
+      this.onclick(this.filterMap)
       loading.close()
       this.batchCarrierVisible = false
     },
@@ -3812,20 +3889,20 @@ export default {
             .then(res => {
               if (res.data.code == '200') {
                 this.$message.success('关闭车辆成功')
-                this.getSteelReport()
+                this.onclick(this.filterMap)
                 this.operation(this.steelMap)
                 loading.close()
               } else {
                 this.$message.error('关闭车辆失败')
                 this.operation(this.steelMap)
-                this.getSteelReport()
+                this.onclick(this.filterMap)
                 loading.close()
               }
             })
             .catch(() => {
               this.$message.error('关闭车辆失败')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             })
         })
@@ -3837,7 +3914,7 @@ export default {
     updateTruckCarrier() {
       if (this.steelMap.newCarrierId == null) {
         this.$message.warning('请注册承运商或者选中弹出层之后再提交!')
-        this.getSteelReport()
+        this.onclick(this.filterMap)
         return
       }
       if (this.steelMap.carrierIds != 0) {
@@ -3853,19 +3930,19 @@ export default {
             if (res.data.code == '200') {
               this.$message.success('修改承运商授权成功')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             } else {
               this.$message.error('修改失败,请联系管理员!')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             }
           })
           .catch(() => {
             this.$message.error('修改失败,请联系管理员!')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           })
       } else {
@@ -3884,19 +3961,19 @@ export default {
             if (res.data.code == '0') {
               this.$message.success('授权承运商成功')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             } else {
               this.$message.error('授权失败,请联系管理员')
               this.operation(this.steelMap)
-              this.getSteelReport()
+              this.onclick(this.filterMap)
               loading.close()
             }
           })
           .catch(() => {
             this.$message.error('授权失败,请联系管理员')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           })
       }
@@ -4008,19 +4085,19 @@ export default {
           if (res.data.code == '200') {
             this.$message.success('修改收货地址成功!')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           } else {
             this.$message.error('修改失败,请联系管理员!')
             this.operation(this.steelMap)
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           }
         })
         .catch(() => {
           this.$message.error('修改失败,请联系管理员!')
           this.operation(this.steelMap)
-          this.getSteelReport()
+          this.onclick(this.filterMap)
           loading.close()
         })
     },
@@ -4052,7 +4129,7 @@ export default {
             this.$message.error('修改失败,请联系管理员!')
           })
       })
-      this.getSteelReport()
+      this.onclick(this.filterMap)
       loading.close()
       this.batchCarrierVisible = false
     },
@@ -4150,17 +4227,17 @@ export default {
         .then(res => {
           if (res.data.code == '200') {
             this.$message.success('修改物资数量成功')
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           } else {
             this.$message.error('修改物资数量失败,请联系管理员')
-            this.getSteelReport()
+            this.onclick(this.filterMap)
             loading.close()
           }
         })
         .catch(() => {
           this.$message.error('修改物资数量失败,请联系管理员')
-          this.getSteelReport()
+          this.onclick(this.filterMap)
           loading.close()
         })
     },
@@ -4198,19 +4275,19 @@ export default {
                 if (res.data.code == '200') {
                   this.$message.success('关闭成功')
                   this.operation(this.steelMap)
-                  this.getSteelReport()
+                  this.onclick(this.filterMap)
                   loading.close()
                 } else {
                   this.$message.error('关闭失败,请联系管理员')
                   this.operation(this.steelMap)
-                  this.getSteelReport()
+                  this.onclick(this.filterMap)
                   loading.close()
                 }
               })
               .catch(() => {
                 this.$message.error('关闭失败,请联系管理员')
                 this.operation(this.steelMap)
-                this.getSteelReport()
+                this.onclick(this.filterMap)
                 loading.close()
               })
           }
@@ -4321,15 +4398,15 @@ export default {
           if (res.data.data.length > 0) {
             this.totalNumber = res.data.data[0].totalNumber
             this.totalCapacity = res.data.data[0].totalCapacity
-            this.filterConsigneeList = res.data.data[0].filterConsigneeList
-            this.filterCarrierList = res.data.data[0].filterCarrierList
-            this.filterCapacityList = res.data.data[0].filterCapacityList
-            this.filtermaterialNameList =
-              res.data.data[0].filtermaterialNameList
-            this.filterorderStatus = res.data.data[0].filterorderStatus
-            this.filteraddressPlace = res.data.data[0].filteraddressPlace
-            this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
-            this.filterSaleRemark = res.data.data[0].filterSaleRemark
+            // this.filterConsigneeList = res.data.data[0].filterConsigneeList
+            // this.filterCarrierList = res.data.data[0].filterCarrierList
+            // this.filterCapacityList = res.data.data[0].filterCapacityList
+            // this.filtermaterialNameList =
+            //   res.data.data[0].filtermaterialNameList
+            // // this.filterorderStatus = res.data.data[0].filterorderStatus
+            // this.filteraddressPlace = res.data.data[0].filteraddressPlace
+            // this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
+            // this.filterSaleRemark = res.data.data[0].filterSaleRemark
           }
           this.maxHeight =
             window.innerHeight -
@@ -4468,7 +4545,7 @@ export default {
             this.filterCapacityList = res.data.data[0].filterCapacityList
             this.filtermaterialNameList =
               res.data.data[0].filtermaterialNameList
-            this.filterorderStatus = res.data.data[0].filterorderStatus
+            // this.filterorderStatus = res.data.data[0].filterorderStatus
             this.filteraddressPlace = res.data.data[0].filteraddressPlace
             this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
             this.filterSaleRemark = res.data.data[0].filterSaleRemark
@@ -4662,28 +4739,28 @@ export default {
           margin-right: 10px;
           .steelMapClass921 {
             text-align: start;
-            min-width: 250px;
-            .el-input {
+            min-width: 350px;
+            .el-textarea {
               width: auto;
             }
-            /deep/ .el-input__prefix {
-              display: inline-block;
-              position: relative;
-              border: 1px solid #dcdfe6;
-              box-sizing: border-box;
-              color: #606266;
-              font-size: inherit;
-              height: 40px;
-              line-height: 40px;
-              padding: 0 30px;
-              transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-              padding-left: 30px;
-              left: 0;
-              visibility: hidden;
-            }
-            /deep/ .el-input__inner {
-              position: absolute;
-            }
+            // /deep/ .el-input__prefix {
+            //   display: inline-block;
+            //   position: relative;
+            //   border: 1px solid #dcdfe6;
+            //   box-sizing: border-box;
+            //   color: #606266;
+            //   font-size: inherit;
+            //   height: 40px;
+            //   line-height: 40px;
+            //   padding: 0 30px;
+            //   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+            //   padding-left: 30px;
+            //   left: 0;
+            //   visibility: hidden;
+            // }
+            // /deep/ .el-textarea__inner {
+            //   position: absolute;
+            // }
           }
         }
       }

+ 4 - 0
src/views/statisticalReport/components/salesLogisticsStatistics/unloadingSteelReports.vue

@@ -47,6 +47,9 @@
             placeholder="请输入查询条件"
             clearable
           ></el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="exportAllReportToExcel"
@@ -717,6 +720,7 @@ export default {
             map.operator = getCookie('loginName')
             saleOrderListMap.push(map)
           })
+          console.log(saleOrderListMap, 'saleOrderListMap')
           this.axios
             .post('/api/v1/ams/addUnloadSteelSaleOrderList', saleOrderListMap, {
               timeout: 5 * 60 * 1000

File diff suppressed because it is too large
+ 0 - 0
static/lib/element-ui/element-ui.css


Some files were not shown because too many files changed in this diff