das

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', 'queue']
+// let devModules = ['index', 'statisticalReport', 'inward', 'appoint']
 let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -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.104:8080',
     ws: true,
     pathRewrite: {

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

@@ -303,7 +303,7 @@ export default {
         requestUrl: '',
         selectionType: 'select',
         comparison: 'saleNumber',
-        columnIndexs: [0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option4: {
         // 表格请求数据的地址

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

@@ -182,8 +182,68 @@
         </div>
       </div>
     </div>
-
-    <div>
+    <div class="query">
+      <el-divider></el-divider>
+      <el-form :inline="true">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >发坯日期：</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:150px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:150px"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="选择班别" style="margin-left:10px">
+          <el-select
+            class="inline-select"
+            v-model="clazz"
+            style="width:150px"
+            clearable
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择班次" style="margin-left:10px">
+          <el-select
+            class="inline-select"
+            v-model="shift"
+            style="width:150px"
+            clearable
+          >
+            <el-option
+              v-for="item in optionShift"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          ><el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i> </el-button
+        ></el-form-item>
+      </el-form>
+    </div>
+    <div class="table">
       <mergeRowTable v-bind.sync="first" ref="table" :isShowGroup="false">
         <el-table-column label="操作" width="80px" fixed="right">
           <template slot-scope="scope">
@@ -211,6 +271,8 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      startTime: null,
+      endTime: null,
       checkWeight: null,
       checkCount: null,
       checkHeatNo: null,
@@ -310,7 +372,8 @@ export default {
       capacityIds: [],
       first: {
         // first请求数据的地址
-        requestUrl: ''
+        requestUrl: '',
+        requestQuery: {}
       },
       isMeter: '需要过磅'
     }
@@ -357,6 +420,29 @@ export default {
     }
   },
   methods: {
+    onclick() {
+      let startTime = null
+      let endTime = null
+      let obj = {}
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
+      }
+      if (this.clazz) {
+        obj.clazz = this.clazz
+      }
+      if (this.shift) {
+        obj.shift = this.shift
+      }
+      this.first.requestQuery = obj
+      this.first.requestUrl =
+        '/api/v1/ams/getBilletRequirementList?apiId=518&startTime=' +
+        startTime +
+        '&endTime=' +
+        endTime +
+        '&i=' +
+        new Date()
+    },
     getRequestUrl() {
       if (
         getCookie('orgCode') == 'dagangadmin' ||
@@ -627,6 +713,12 @@ export default {
       }
     }
   }
+  .query {
+    margin-left: 10px;
+  }
+  .table {
+    margin-left: 10px;
+  }
 }
 </style>
 <style>

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

@@ -1257,9 +1257,9 @@ 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`
         })
       }
     }
@@ -1280,7 +1280,7 @@ export default {
       this.scrollTop = e.target.scrollTop
       setTimeout(() => {
         this.debounceS = false
-      }, 100)
+      }, 50)
     })
   },
   activated() {