修改

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // let devModules = ['all']
 // let devModules = ['index', 'statisticalReport']
 let devModules = ['all']
-// let devModules = ['index', 'OYE', 'statisticalReport']
+// let devModules = ['index', 'OYE', 'appoint', 'RMS']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/components/DilCommonUI/packages/table/src/table.js

@@ -55,7 +55,6 @@ export default {
     // },
     // 通过请求获取数据
     requestData(options) {
-      console.log('我被调用了几次')
       let pageNum = undefined
       let pageSize = undefined
 

src/views/OYE/components/oYeInbound.vue

@@ -2,6 +2,11 @@
   <div class="oYeInbound">
     <div class="search">
       <el-form :inline="true">
+        <el-form-item v-if="Object.keys(queryMap).length > 0">
+          <span style="color: #409EFF;font-size: 18px;font-weight: 700;"
+            >入库明细</span
+          >
+        </el-form-item>
         <el-form-item>
           <el-date-picker
             v-model="startTime"
@@ -54,6 +59,13 @@
           <el-input v-model="con1" style="width:200px" clearable></el-input>
         </el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
+        <el-button
+          type="primary"
+          @click="back"
+          v-if="Object.keys(queryMap).length > 0"
+        >
+          返回</el-button
+        >
         <el-form-item></el-form-item>
       </el-form>
     </div>
@@ -137,10 +149,18 @@ export default {
         'netWeight',
         'theoryWeight',
         'orderNetWeight'
-      ]
+      ],
+      queryMap: {}
     }
   },
   created() {
+    if (Object.keys(this.$route.query).length > 0) {
+      this.queryMap = this.$route.query
+      this.startTime = this.queryMap.startTime
+      this.endTime = this.queryMap.endTime
+    } else {
+      this.queryMap = {}
+    }
     this.getInfo()
     this.getRequestUrl()
   },
@@ -152,7 +172,9 @@ export default {
         // backgroundColor: '#FFFF01'
       }
     },
-
+    back() {
+      this.$router.go(-1)
+    },
     getInfo() {
       this.orgCode = getCookie('orgCode')
       if (this.orgCode == 'shouhuokehu' || this.orgCode == 'chengyunshang') {
@@ -189,6 +211,9 @@ export default {
       if (this.orgCode == 'xiaoshouyewuyuan') {
         queryMap['saler'] = getCookie('loginName')
       }
+      if (Object.keys(this.queryMap).length > 0) {
+        queryMap = { ...queryMap, ...this.queryMap }
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

src/views/OYE/components/oYeOutbound.vue

@@ -2,6 +2,11 @@
   <div class="oYeOutbound">
     <div class="search">
       <el-form :inline="true">
+        <el-form-item v-if="Object.keys(queryMap).length > 0">
+          <span style="color: #409EFF;font-size: 18px;font-weight: 700;"
+            >出库明细</span
+          >
+        </el-form-item>
         <el-form-item>
           <el-date-picker
             v-model="startTime"
@@ -54,6 +59,12 @@
           <el-input v-model="con1" style="width:200px" clearable></el-input>
         </el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
+        <el-button
+          type="primary"
+          @click="back"
+          v-if="Object.keys(queryMap).length > 0"
+          >返回</el-button
+        >
         <el-form-item></el-form-item>
       </el-form>
     </div>
@@ -127,14 +138,23 @@ export default {
       apiId: '530',
       orgCode: null,
       loginName: null,
-      showSummaryList: ['materialNumber', 'netWeight', 'theoryWeight']
+      showSummaryList: ['materialNumber', 'netWeight', 'theoryWeight'],
+      queryMap: {}
     }
   },
   created() {
+    if (Object.keys(this.$route.query).length > 0) {
+      this.queryMap = this.$route.query
+      this.startTime = this.queryMap.startTime
+      this.endTime = this.queryMap.endTime
+    }
     this.getInfo()
     this.getRequestUrl()
   },
   methods: {
+    back() {
+      this.$router.go(-1)
+    },
     returnClassName({ row, column, rowIndex, columnIndex }) {
       return {
         fontWeight: '500 !important',
@@ -177,6 +197,9 @@ export default {
       if (this.orgCode == 'xiaoshouyewuyuan') {
         queryMap['saler'] = getCookie('loginName')
       }
+      if (Object.keys(this.queryMap).length > 0) {
+        queryMap = { ...queryMap, ...this.queryMap }
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

src/views/OYE/components/oYeTransPlan.vue

@@ -130,7 +130,11 @@
             <el-input v-model="planForm.shipperName" disabled></el-input>
           </el-form-item>
           <el-form-item label="收货单位" prop="receiveId">
-            <el-select v-model="planForm.receiveId" style="width:auto">
+            <el-select
+              v-model="planForm.receiveId"
+              style="width:auto"
+              clearable
+            >
               <el-option
                 v-for="item in consigneeInfo"
                 :label="item.label"
@@ -145,6 +149,7 @@
               v-model="planForm.saleRemark"
               style="width:auto"
               :disabled="planForm.receiveId == null ? true : false"
+              clearable
             >
               <el-option
                 v-for="item in saleAreaInfo"
@@ -156,7 +161,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="业务员">
-            <el-select v-model="planForm.saleMan" style="width:auto">
+            <el-select v-model="planForm.saleMan" style="width:auto" clearable>
               <el-option
                 v-for="item in saleMans"
                 :label="item.label"
@@ -167,7 +172,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="是否自提">
-            <el-select v-model="planForm.isSelfMention" style="width:auto">
+            <el-select
+              v-model="planForm.isSelfMention"
+              style="width:auto"
+              clearable
+            >
               <el-option label="是" value="是" :key="1"> </el-option>
               <el-option label="否" value="否" :key="0"> </el-option>
             </el-select>
@@ -193,6 +202,9 @@
               filterable
               placeholder="请选择"
               @change="onchangeProvince"
+              :disabled="planForm.saleRemark == null"
+              no-data-text="无匹配项,请维护片区与直发城市对应关系"
+              no-match-text="请维护片区与该城市对应关系"
             >
               <el-option
                 v-for="item in provinceList"
@@ -209,6 +221,8 @@
               placeholder="请选择"
               @change="onchangeCity"
               :disabled="planForm.province == null ? true : false"
+              no-data-text="无匹配项,请维护片区与直发城市对应关系"
+              no-match-text="请维护片区与该城市对应关系"
             >
               <el-option
                 v-for="item in cityList"
@@ -225,6 +239,8 @@
               placeholder="请选择"
               @change="onchangeCounty"
               :disabled="planForm.city == null ? true : false"
+              no-data-text="请维护片区与直发城市对应关系"
+              no-match-text="请维护片区与该城市对应关系"
             >
               <el-option
                 v-for="item in countyList"
@@ -672,6 +688,10 @@ export default {
           label: '件数',
           slot: true
         },
+        {
+          prop: 'inventoryNumber',
+          label: '库存件数'
+        },
         {
           prop: 'singleWeight',
           label: '单重'
@@ -725,6 +745,10 @@ export default {
           width: '60px',
           slot: true
         },
+        {
+          prop: 'inventoryNumber',
+          label: '库存件数'
+        },
         {
           prop: 'isPound',
           label: '是否磅重销售',
@@ -775,7 +799,10 @@ export default {
       orgCode: '',
       showSummaryList: ['materialNumber', 'materialWeight'],
       userId: '',
-      userName: ''
+      userName: '',
+      directlyCityList: [],
+      directlyProvinceList: [],
+      directlyTownList: []
     }
   },
   created() {
@@ -790,6 +817,7 @@ export default {
     saleRemark(val) {
       console.log(val, 'val')
       this.getOyeConsigneeId({ saleArea: val })
+      this.getDirectlyCity(val)
       this.updateAddress(val)
     },
     receiveCompanyId(val) {
@@ -819,6 +847,15 @@ export default {
         this.materialList1 = []
         this.selectionList = []
       }
+    },
+    directlyProvinceListLength(val) {
+      this.getAllProvince()
+    },
+    directlyCityListLength(val) {
+      this.onchangeProvince()
+    },
+    directlyTownListLength(val) {
+      this.onchangeCity()
     }
   },
   computed: {
@@ -836,10 +873,52 @@ export default {
     },
     county() {
       return this.planForm.county
+    },
+    directlyProvinceListLength() {
+      return this.directlyProvinceList.length
+    },
+    directlyCityListLength() {
+      return this.directlyCityList.length
+    },
+    directlyTownListLength() {
+      return this.directlyTownList.length
     }
   },
   methods: {
-    updateAddress(val) {},
+    getDirectlyCity(val) {
+      if (val == '' || val == null) {
+        return
+      }
+      this.axios.post('/api/v1/rms/getDirectlySentCity?con' + val).then(res => {
+        console.log(res, 'res')
+        this.directlyProvinceList = res.data.data
+          .map(item => {
+            return item.addressProvince
+          })
+          .filter(item => {
+            return item != '' && item != null && item != undefined
+          })
+        this.directlyCityList = res.data.data
+          .map(item => {
+            return item.addressDistrict
+          })
+          .filter(item => {
+            return item != '' && item != null && item != undefined
+          })
+        this.directlyTownList = res.data.data
+          .map(item => {
+            return item.addressTown
+          })
+          .filter(item => {
+            return item != '' && item != null && item != undefined
+          })
+        console.log(
+          this.directlyProvinceList,
+          this.directlyCityList,
+          this.directlyTownList
+        )
+      })
+    },
     getInfo() {
       this.loginName = getCookie('loginName')
       this.orgCode = getCookie('orgCode')
@@ -943,13 +1022,25 @@ export default {
     getAllsaleMan() {
       this.axios.get('/api/v1/uc/getSalerList').then(res => {
         this.saleMans = res.data.data
+        if (this.orgCode == 'xiaoshouyewuyuan') {
+          this.saleMans = this.saleMans.filter(item => {
+            return item.label == this.loginName
+          })
+          if (this.saleMans.length == 1) {
+            this.planForm.saleMan = this.saleMans[0].value
+          }
+        }
       })
     },
     //获取所有省数据
     getAllProvince() {
-      this.axios.post('/api/v1/uc/getAllProvince').then(res => {
-        this.provinceList = res.data.data
-      })
+      this.axios
+        .post('/api/v1/uc/getAllProvince', {
+          directlyProvinceList: this.directlyProvinceList
+        })
+        .then(res => {
+          this.provinceList = res.data.data
+        })
     },
     //省改变
     onchangeProvince(val) {
@@ -958,7 +1049,10 @@ export default {
           '/api/v1/uc/getDistrictByProvince?addressProvince=' +
             val +
             '&i=' +
-            new Date()
+            new Date(),
+          {
+            directlyCityList: this.directlyCityList
+          }
         )
         .then(res => {
           this.cityList = res.data.data
@@ -971,11 +1065,13 @@ export default {
           '/api/v1/uc/getTownByDistrict?addressDistrict=' +
             val +
             '&i=' +
-            new Date()
+            new Date(),
+          {
+            directlyTownList: this.directlyTownList
+          }
         )
         .then(res => {
           this.countyList = res.data.data
-          this.remarks = this.remarksPro + `,直发${this.city}`
         })
     },
     //县(区)改变
@@ -1047,9 +1143,11 @@ export default {
         map = JSON.parse(JSON.stringify(e))
         map.isPound = getisPound
         map.meterNumber = e.meter
+        map.inventoryNumber = e.materialNumber
         map.Specification = `${e.materialSpe}(${e.materialModel})`
         map.orderPlanWeight = null
         map.carNumber = null
+
         this.materialList.push(map)
       })
       console.log(this.materialList, 'materialList')
@@ -1154,6 +1252,7 @@ export default {
     },
     addMaterialToSaleOrderSingle() {
       this.materialList.forEach(e => {
+        console.log(e, 'e')
         var addmap = {
           cxh: this.maxCxh,
           materialName: e.materialName,
@@ -1163,6 +1262,7 @@ export default {
           meterNumber: e.meterNumber,
           isPound: e.isPound,
           saleShipperAddressId: this.planForm.shipperAddressId,
+          inventoryNumber: e.inventoryNumber,
           inboundWarehouse: e.inboundWarehouse,
           inventoryId: e.inventoryId,
           singleWeight: e.singleWeight,
@@ -1276,7 +1376,7 @@ export default {
               inboundWarehouse: e.inboundWarehouse,
               singleWeight: e.singleWeight,
               inventoryId: e.inventoryId,
-
+              inventoryNumber: e.inventoryNumber,
               place: this.planForm.place,
               saleShipperAddressName:
                 this.planForm.province +
@@ -1313,7 +1413,7 @@ export default {
             inboundWarehouse: e.inboundWarehouse,
             singleWeight: e.singleWeight,
             inventoryId: e.inventoryId,
-
+            inventoryNumber: e.inventoryNumber,
             place: this.planForm.place,
             saleShipperAddressName:
               this.planForm.province +
@@ -1426,6 +1526,7 @@ export default {
         map.deleted = 0
         map.orderPlanWeight = item.materialNumber
         map.inventoryId = item.inventoryId
+        map.userName = getCookie('loginName')
         return map
       })
       this.$confirm('确认审核选中的转运计划', '提示', {
@@ -1457,6 +1558,8 @@ export default {
       console.log(this.approvingList, 'arr')
       let arr = this.approvingList.map(item => {
         let map = {}
+        map.userName = getCookie('loginName')
+
         map.orderStatus = this.activeName == 'first' ? 0 : 4
         map.saleOrderId = item.saleOrderId
         map.deleted = 1
@@ -1496,6 +1599,8 @@ export default {
         map.deleted = 0
         map.orderPlanWeight = item.materialNumber
         map.inventoryId = item.inventoryId
+        map.userName = getCookie('loginName')
+
         return map
       })
       this.$confirm('确认提交选中的转运计划', '提示', {

src/views/OYE/components/oYeTransResult.vue

@@ -244,7 +244,7 @@
           column-key="orderTime"
           key="orderTime"
           show-overflow-tooltip
-          v-if="!columnNoRoutList.includes('订单日期')"
+          v-if="!columnNoRoutList.includes('计划日期')"
         >
         </el-table-column>
         <el-table-column
@@ -255,7 +255,7 @@
           column-key="saleMakeDate"
           key="saleMakeDate"
           show-overflow-tooltip
-          v-if="!columnNoRoutList.includes('订单日期')"
+          v-if="!columnNoRoutList.includes('出库日期')"
         >
         </el-table-column>
         <el-table-column
@@ -267,7 +267,7 @@
           key="inventoryWarehouse"
           :filters="filterWarehouse"
           show-overflow-tooltip
-          v-if="!columnNoRoutList.includes('订单日期')"
+          v-if="!columnNoRoutList.includes('出库库房')"
         >
         </el-table-column>
         <el-table-column
@@ -279,7 +279,7 @@
           align="center"
           :filters="filterSaleOrderStatus"
           sortable
-          v-if="!columnNoRoutList.includes('销售订单状态')"
+          v-if="!columnNoRoutList.includes('计划状态')"
         >
         </el-table-column>
         <el-table-column
@@ -290,7 +290,7 @@
           column-key="consigneeName"
           key="consigneeName"
           show-overflow-tooltip
-          v-if="!columnNoRoutList.includes('客户')"
+          v-if="!columnNoRoutList.includes('收货单位')"
           :render-header="renderHeader"
         >
         </el-table-column>
@@ -312,7 +312,7 @@
           align="center"
           width="100"
           :filters="filterorderStatusActually"
-          v-if="!columnNoRoutList.includes('运单状态')"
+          v-if="!columnNoRoutList.includes('订单实际状态')"
         >
         </el-table-column>
         <el-table-column
@@ -369,7 +369,7 @@
           label="米数"
           align="center"
           width="50px"
-          v-if="!columnNoRoutList.includes('物资件数')"
+          v-if="!columnNoRoutList.includes('米数')"
         >
         </el-table-column>
         <el-table-column
@@ -379,7 +379,7 @@
           label="单重"
           align="center"
           width="50px"
-          v-if="!columnNoRoutList.includes('物资件数')"
+          v-if="!columnNoRoutList.includes('单重')"
         >
         </el-table-column>
         <el-table-column
@@ -399,7 +399,7 @@
           label="出库理重"
           align="center"
           width="50px"
-          v-if="!columnNoRoutList.includes('理重')"
+          v-if="!columnNoRoutList.includes('出库理重')"
         >
         </el-table-column>
         <el-table-column
@@ -409,7 +409,7 @@
           label="出库净重"
           align="center"
           width="50px"
-          v-if="!columnNoRoutList.includes('净重')"
+          v-if="!columnNoRoutList.includes('出库净重')"
         >
         </el-table-column>
         <el-table-column
@@ -618,7 +618,7 @@
           label="转运计划号"
           width="200px"
           align="center"
-          v-if="!columnNoRoutList.includes('销售订单号')"
+          v-if="!columnNoRoutList.includes('转运计划号')"
         >
         </el-table-column>
         <el-table-column
@@ -1983,6 +1983,8 @@ export default {
       batchCarrierList: [],
       columnNoRoutList: [],
       salerExportExcelList: [
+        '出库库房',
+        '出库理重',
         '订单日期',
         '客户',
         '物资名称',
@@ -2060,31 +2062,7 @@ export default {
     }, 100)
     this.orgCode = getCookie('orgCode')
     this.userId = getCookie('userId')
-    if (this.orgCodeList.includes(getCookie('orgCode'))) {
-      this.isShowOperate = true
-    }
     if (getCookie('orgCode') == 'chengyunshang') {
-      this.notRoutList = [
-        'checkPoint',
-        'checkTrans',
-        'carrierName',
-        'consigeeTel',
-        'province',
-        'city',
-        'country',
-        'place',
-        'addressClick',
-        'closeOrder',
-        'materialNum',
-        'closeEntry',
-        'capacityNo',
-        'batchCarrier',
-        'select',
-        'exceptionHandle',
-        'mergeSplit',
-        'saleLog',
-        'batchCapacity'
-      ]
       this.noticeInterval = setInterval(() => {
         this.getinformation()
       }, 1000 * 180)
@@ -2096,7 +2074,7 @@ export default {
         .post('/api/v1/uc/getColumnNoRoutList', {
           orgCode: getCookie('orgCode'),
           userName: getCookie('loginName'),
-          tableName: '销售钢材报表'
+          tableName: '欧冶转运报表'
         })
         .then(res => {
           this.columnNoRoutList = res.data
@@ -2105,9 +2083,6 @@ export default {
     } else {
       this.getColumShowHideScheme()
     }
-    if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
-      this.isShowOperateYeWuYuan = true
-    }
     if (getCookie('orgCode') == 'ouyechangwaiku') {
       this.inboundWarehouse = getCookie('loginName')
     }
@@ -2347,7 +2322,7 @@ export default {
         .post('/api/v1/uc/getColumShowHideScheme', {
           userName: getCookie('loginName'),
           orgCode: getCookie('orgCode'),
-          tableName: '销售钢材报表'
+          tableName: '欧冶转运报表'
         })
         .then(res => {
           this.schemeMap = res.data.data

src/views/OYE/components/sendReceiveReport.vue

@@ -68,6 +68,7 @@
         :show-summary="true"
         :row-style="{ height: '30px' }"
         :cell-style="returnClassName"
+        @cell-dblclick="cellDbClick"
       >
         <el-table-column
           v-for="item in tableTop"
@@ -191,11 +192,54 @@ export default {
     }
   },
   created() {
+    console.log('我在这里')
     this.getInfo()
     this.getRequestUrl()
   },
   mounted() {},
   methods: {
+    cellDbClick(row, column, cell, event) {
+      console.log(row)
+      console.log(column)
+      let map = {}
+      map.startTime = this.startTime
+      map.endTime = this.endTime
+      map.consigneeName = row.companyName
+      map.saleArea = row.saleArea
+      map.inboundWarehouse = row.inboundWarehouse
+      map.materialName = row.materialName
+      map.materialSpe = row.materialSpe
+      map.materialModel = row.materialModel
+      if (column.label.includes('当日入库')) {
+        this.$router.push({
+          path: '/oYeInbound',
+          query: map
+        })
+      }
+      if (column.label.includes('当日出库')) {
+        this.$router.push({
+          path: '/oYeOutbound',
+          query: map
+        })
+      }
+      if (column.label.includes('总出库')) {
+        map.startTime = null
+        map.endTime = null
+        this.$router.push({
+          path: '/oYeOutbound',
+          query: map
+        })
+      }
+      if (column.label.includes('总入库')) {
+        map.startTime = null
+        map.endTime = null
+        this.$router.push({
+          path: '/oYeInbound',
+          query: map
+        })
+      }
+      console.log(map)
+    },
     getInfo() {
       this.orgCode = getCookie('orgCode')
       if (this.orgCode == 'shouhuokehu' || this.orgCode == 'chengyunshang') {

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

@@ -1988,14 +1988,6 @@
             ></el-table-column>
             <el-table-column prop="saleRemarkByasm" label="摘要" width="180px">
             </el-table-column>
-            <el-table-column label="入库净重">
-              <template slot-scope="scope">
-                <el-input
-                  v-model.number="scope.row.inboundNetWeight"
-                  type="number"
-                ></el-input>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
         <span
@@ -2738,7 +2730,7 @@ export default {
         map.place = e.place
         map.placeId = e.placeId
         map.meter = e.steelMeters
-        map.netWeight = e.inboundNetWeight
+        map.netWeight = e.netWeight
         map.materialNumber = e.materialNumber
         map.theoryWeight = e.theoryWeight
         map.materialId = e.materialId