修改

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
 // let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'inward', 'appoint']
+let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -243,34 +243,6 @@
           width="180px"
         >
         </el-table-column>
-        <el-table-column
-          prop="orderNum"
-          label="运输订单号"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="wgmDelete"
-          label="入库状态"
-          align="center"
-          width="100px"
-          column-key="wgmDelete"
-          :filters="[
-            { text: '入库', value: '入库' },
-            { text: '出库', value: '出库' },
-            { text: '待入库', value: '待入库' }
-          ]"
-          :filter-method="filterDeleted"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="outGateTime"
-          label="出厂日期"
-          align="center"
-          width="150px"
-        >
-        </el-table-column>
         <el-table-column
           prop="EnStation"
           label="进站日期"
@@ -331,71 +303,100 @@
             </el-date-picker>
           </template>
         </el-table-column>
-
         <el-table-column
-          prop="number"
-          label="票号"
+          prop="inboundPersonnelName"
+          label="入库操作人"
           align="center"
-          width="180px"
+          width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="consigneeName"
-          label="客户"
+          prop="inboundTime"
+          label="入库时间"
           align="center"
           width="150px"
         >
         </el-table-column>
+
         <el-table-column
-          prop="isAccept"
-          label="是否验收"
+          prop="outboundPersonnelName"
+          label="出库操作人"
           align="center"
           width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="isAcceptTime"
-          label="验收时间"
+          prop="outboundTime"
+          label="出库时间"
           align="center"
           width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="inboundPersonnelName"
-          label="入库操作人"
+          prop="belongCompany"
+          label="所属公司"
+          width="200px"
           align="center"
-          width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="inboundTime"
-          label="入库时间"
+          prop="orderNum"
+          label="运输订单号"
+          align="center"
+          width="180px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="wgmDelete"
+          label="入库状态"
+          align="center"
+          width="100px"
+          column-key="wgmDelete"
+          :filters="[
+            { text: '入库', value: '入库' },
+            { text: '出库', value: '出库' },
+            { text: '待入库', value: '待入库' }
+          ]"
+          :filter-method="filterDeleted"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="outGateTime"
+          label="出厂日期"
           align="center"
           width="150px"
         >
         </el-table-column>
 
         <el-table-column
-          prop="outboundPersonnelName"
-          label="出库操作人"
+          prop="number"
+          label="票号"
+          align="center"
+          width="180px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="consigneeName"
+          label="客户"
           align="center"
           width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="outboundTime"
-          label="出库时间"
+          prop="isAccept"
+          label="是否验收"
           align="center"
           width="150px"
         >
         </el-table-column>
         <el-table-column
-          prop="belongCompany"
-          label="所属公司"
-          width="200px"
+          prop="isAcceptTime"
+          label="验收时间"
           align="center"
+          width="150px"
         >
         </el-table-column>
+
         <el-table-column
           prop="railwayBureau"
           label="到局"
@@ -545,6 +546,9 @@ export default {
       }
     },
     batchOperate() {
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        return
+      }
       this.$refs.tableRef.data.forEach((e, index) => {
         this.$refs.tableRef.data.forEach((item, index) => {
           if (
@@ -640,6 +644,9 @@ export default {
       }
     },
     operate(row) {
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        return
+      }
       row.personnelSsoId = getCookie('userId')
       if (
         (typeof row.EnStation == 'object' ||
@@ -676,6 +683,11 @@ export default {
     },
     //查询事件
     onclick() {
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        let consigneeLoginName =
+          JSON.parse(getCookie('userInfo')).userCode || getCookie('loginName')
+        this.filterMap.consigneeLoginName = consigneeLoginName
+      }
       let startTime = null
       let endTime = null
       let wagonNo = null
@@ -738,10 +750,17 @@ export default {
     },
     //获取后台数据
     getRequestUrl() {
+      let map = {}
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        let consigneeLoginName =
+          JSON.parse(getCookie('userInfo')).userCode || getCookie('loginName')
+        map.consigneeLoginName = consigneeLoginName
+      }
       this.axios
         .post(
           '/api/v1/oms/getWagonShippingDetails?startTime=null&endTime=null&i=' +
-            new Date()
+            new Date(),
+          map
         )
         .then(res => {
           console.log(res.data.data)

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

@@ -754,6 +754,16 @@
           v-if="!columnNoRoutList.includes('理论件数')"
         >
         </el-table-column>
+        <el-table-column
+          prop="saleOrderReceiveCustomer"
+          column-key="saleOrderReceiveCustomer"
+          key="saleOrderReceiveCustomer"
+          label="收款公司"
+          align="center"
+          width="200px"
+          v-if="!columnNoRoutList.includes('收款公司')"
+        >
+        </el-table-column>
       </el-table>
     </div>
     <div>
@@ -2033,7 +2043,8 @@ export default {
         '运输订单变更记录',
         '拼数',
         '是否继续装',
-        '订单上传时间'
+        '订单上传时间',
+        '收款公司'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID