修改

src/views/OYE/components/oYeOutbound.vue

@@ -78,6 +78,7 @@
         :showIndex="false"
         :row-style="{ height: '35px' }"
         :cell-style="returnClassName"
+        @func="func"
       ></dilTable>
     </div>
   </div>

src/views/OYE/components/oYeRealTimeInventory.vue

@@ -219,7 +219,7 @@ export default {
         },
         {
           value: 'saleArea',
-          label: '直发'
+          label: '片区'
         },
         {
           value: 'inboundArea',

src/views/OYE/components/oYeTransResult.vue

@@ -50,9 +50,10 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;"
-            >计划日期：</label
-          >
+          <el-select v-model="dateType" placeholder="请选择" style="width:90px">
+            <el-option label="计划日期" value="1" key="1"></el-option>
+            <el-option label="出库日期" value="2" key="2"></el-option>
+          </el-select>
           <el-date-picker
             v-model="startTime"
             type="date"
@@ -258,6 +259,18 @@
           v-if="!columnNoRoutList.includes('出库日期')"
         >
         </el-table-column>
+        <el-table-column
+          prop="outboundStatus"
+          label="出库状态"
+          width="110px"
+          align="center"
+          column-key="outboundStatus"
+          key="outboundStatus"
+          show-overflow-tooltip
+          :filters="filterOutboundStatus"
+          v-if="!columnNoRoutList.includes('是否出库')"
+        >
+        </el-table-column>
         <el-table-column
           prop="inventoryWarehouse"
           label="出库库房"
@@ -610,7 +623,15 @@
           v-if="!columnNoRoutList.includes('是否自提')"
         >
         </el-table-column>
-
+        <el-table-column
+          prop="saleMaterialId"
+          column-key="saleMaterialId"
+          key="saleMaterialId"
+          label="分录ID"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="saleOrderNo"
           column-key="saleOrderNo"
@@ -1586,6 +1607,7 @@ export default {
       return startDate
     }
     return {
+      dateType: '1',
       activeMenu: window.top.localStorage.getItem('activeMenu'),
       confireInboundVisible: false,
       toggleRowIds: [],
@@ -1834,7 +1856,7 @@ export default {
         279982,
         279983
       ],
-      tableTitle: '销售钢材统计报表',
+      tableTitle: '欧冶转运出库统计报表',
       //所有省
       provinceList: [],
       //选中的省
@@ -1941,6 +1963,16 @@ export default {
           value: '欧冶巨昌中心库'
         }
       ],
+      filterOutboundStatus: [
+        {
+          text: '未出库',
+          value: '未出库'
+        },
+        {
+          text: '已出库',
+          value: '已出库'
+        }
+      ],
       filterMap: {
         consigneeNameList: [],
         truckRemarkList: [],
@@ -1953,7 +1985,8 @@ export default {
         materialNameList: [],
         carrierList: [],
         capacityList: [],
-        orderStatusActuallyList: []
+        orderStatusActuallyList: [],
+        outboundStatusList: []
       },
       //权限控制
       notRoutList: [],
@@ -2378,7 +2411,7 @@ export default {
       let renderColumnFilterList = []
       let filterVal = ''
       let optionList = []
-      if (column.label === '客户') {
+      if (column.label === '收货单位') {
         filterVal = 'consigneeNameList'
         renderColumnFilterList = this.filterConsigneeList
       } else if (column.label === '车牌号') {
@@ -3240,10 +3273,6 @@ export default {
         return
       }
       let row = this.steelMap
-      if (!row.outGateTime) {
-        this.$message.warning('该车未出厂，不允许签收')
-        return
-      }
       if (row.arrivalAddress) {
         //优先获取抵达地址
         this.location = row.arrivalAddress
@@ -3637,6 +3666,24 @@ export default {
         )
         delete this.filterMap.inventoryWarehouseList
       }
+      //出库状态筛选
+      if (
+        typeof obj.outboundStatus != 'undefined' &&
+        obj.outboundStatus.length > 0
+      ) {
+        this.headColumnList.push('outboundStatus')
+        this.filterMap.outboundStatusList = obj.outboundStatus
+      }
+      if (
+        typeof obj.outboundStatus != 'undefined' &&
+        obj.outboundStatus.length == 0
+      ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('outboundStatus'),
+          1
+        )
+        delete this.filterMap.outboundStatusList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -4949,6 +4996,7 @@ export default {
       } else if (this.input1 != null && this.input1 != '') {
         remark = this.input1
       }
+      obj.dateType = this.dateType
       this.axios
         .post(
           '/api/v1/tms/getOyeSteelReport?startTime=' +
@@ -5140,6 +5188,7 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+      this.filterMap.dateType = this.dateType
       this.axios
         .post(
           '/api/v1/tms/getOyeSteelReport?startTime=' +

src/views/OYE/components/sendReceiveReport.vue

@@ -152,6 +152,7 @@ export default {
         'currentInboundMaterialNumber',
         'currentInboundTheoryWeight',
         'currentOutboundMaterialNumber',
+        'currentOutboundTheoryWeight',
         'currentInboundTheoryWeight'
       ],
       tableData: [],
@@ -162,6 +163,8 @@ export default {
         { label: '物资名称', prop: 'materialName', width: '180px' },
         { label: '规格', prop: 'materialSpe', width: '100px' },
         { label: '型号', prop: 'materialModel', width: '100px' },
+        { label: '米数', prop: 'meter', width: '80px' },
+        { label: '单重', prop: 'singleWeight', width: '80px' },
         { label: '总入库件数', prop: 'inboundMaterialNumber', width: '100px' },
         { label: '总入库重量', prop: 'inboundMaterialWeight', width: '100px' },
         { label: '总出库件数', prop: 'outboundMaterialNumber', width: '100px' },