报表优化

lms/nladmin-ui/src/views/wms/ycl/detail/detail.js

@@ -56,4 +56,12 @@ export function getLotSNList(data) {
   })
 }
 
-export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList }
+export function getIngotBatchList(data) {
+  return request({
+    url: 'api/report/getIngotBatchList',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList,getIngotBatchList }

lms/nladmin-ui/src/views/wms/ycl/detail/index.vue

@@ -70,6 +70,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="批次">
+            <el-select
+              v-model="query.ingotBatch"
+              clearable
+              size="mini"
+              placeholder="批次"
+              class="filter-item"
+              filterable
+              @remote-method="getIngotBatchList"
+            >
+              <el-option
+                v-for="item in ingotBatchList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -228,7 +245,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler" height="550">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
         <el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
         <el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
@@ -237,12 +254,20 @@
         <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
         <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
         <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="productName" label="物料名称" :min-width="flexWidth('productName',crud.data,'物料名称')" />
         <el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
         <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
         <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
         <el-table-column prop="updateTime" label="入库时间" :min-width="70" />
         <el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
-        <el-table-column prop="incomingLength" label="长度mm" :min-width="flexWidth('incomingLength',crud.data,'长度mm')" />
+        <el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
+        <el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
+        <el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
+        <el-table-column label="有效长度mm" :min-width="flexWidth('effectiveLength', crud.data, '有效长度mm')" >
+      <template slot-scope="scope">
+        {{ getEffectiveLength(scope.row) }}
+      </template>
+    </el-table-column>
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -330,6 +355,7 @@ export default {
       regionList: [],
       supplierNameList: [],
       lotSNList: [],
+      ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料'
     }
@@ -340,6 +366,7 @@ export default {
     this.getRegionList()
     this.getSupplierNameList()
     // this.getLotSNList()
+    this.getIngotBatchList()
     this.getProductDescriptionList()
   },
   methods: {
@@ -377,6 +404,11 @@ export default {
         this.productDescriptionList = res.content
       })
     },
+    getIngotBatchList() {
+      crudMaterial.getIngotBatchList().then(res => {
+        this.ingotBatchList = res.content
+      })
+    },
     tableChanged(row) {
       this.form.material_name = row.material_name
       this.form.material_id = row.material_id
@@ -398,6 +430,9 @@ export default {
     },
     hand(value) {
       this.crud.toQuery()
+    },
+    getEffectiveLength(row) {
+      return (row.incomingLength - row.incomingchipping).toFixed(2);
     }
   }
 }