修改厂内钢材车辆总数

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['all']
+let devModules = ['index', 'statisticalReport', 'sale', 'appoint']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    // target: 'http://172.16.33.166:80',
+    target: 'http://localhost:8080',
     // target: 'http://192.168.1.102:8080',
     ws: true,
     pathRewrite: {

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -125,7 +125,9 @@ export default {
   props: {
     // 合并行下标
     columnIndexs: {
-      default: []
+      default() {
+        return []
+      }
     },
     //比对字段
     comparison: {
@@ -190,7 +192,7 @@ export default {
       default: '500px'
     },
     //行展开的key数组，用于控制行是否展开
-    expandRowKeys:[],
+    expandRowKeys: [],
     // 是否启用排序
     sortable: {
       default: 'custom'

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -2,19 +2,20 @@
 <template>
   <div class="steelDetailsOrder">
     <div class="sache">
+      <label class="el-form-item__label" style="width: auto;">订单日期：</label>
       <el-date-picker
         v-model="startTime"
-        type="datetime"
+        type="date"
         placeholder="选择日期"
-        style="width:220px"
+        style="width:200px"
       >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
-        type="datetime"
+        type="date"
         placeholder="选择日期"
-        style="width:220px"
+        style="width:200px"
       >
       </el-date-picker>
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
@@ -30,8 +31,13 @@
       <el-tabs v-model="activeName">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-          <dilTable v-bind.sync="options1" ref="excelDom">
-            <el-table-column fixed="right" label="操作" width="145">
+          <mergeRowTable
+            v-bind.sync="options1"
+            ref="excelDom"
+            :stripe="false"
+            :isPagination="false"
+          >
+            <el-table-column fixed="right" label="操作" width="120">
               <template slot-scope="scope">
                 <el-button
                   v-if="ssoId == null"
@@ -42,17 +48,11 @@
                 >
               </template>
             </el-table-column>
-          </dilTable>
+          </mergeRowTable>
         </el-tab-pane>
         <!-- 已结算 -->
         <el-tab-pane label="已结算" name="second">
-          <dilTable v-bind.sync="options2">
-            <!-- <el-table-column fixed="right" label="操作" width="40">
-                <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getclick(scope)">查看</el-button>
-                </template>
-            </el-table-column> -->
-          </dilTable>
+          <mergeRowTable v-bind.sync="options2"> </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -98,24 +98,6 @@
           ></dilTable>
         </vue-scorll>
       </div>
-      <!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
-          <el-input
-            style="width:250px"
-            v-model="newAddress"
-            disabled
-          ></el-input>
-          <label>现单价</label>
-          <el-input
-            style="width:100px"
-            v-model="newPriceValue"
-            disabled
-          ></el-input>
-          <el-button type="primary" placeholder="()" @click="select"
-            >浏览</el-button
-          >
-        </el-form-item>-->
-
-      <!-- class="dialog-footer" slot="footer"-->
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
@@ -131,6 +113,7 @@ export default {
   data() {
     return {
       aaadrawer: false,
+      pageSize: 100,
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -157,14 +140,8 @@ export default {
       //省市县(区)查询值
       addresText: null,
       noSettleDetailsColumn: [],
-      //达钢的干基
-      DaDryBasis: null,
-      //九江收货的干基
-      JiuDryBasis: null,
       //单价
       Fee: null,
-      //途损费
-      damageFee: null,
       //加载
       selectLineLoading: false,
       input: '',
@@ -174,7 +151,9 @@ export default {
       detailsId: null,
       options1: {
         // first请求数据的地址
-        requestUrl: ''
+        requestUrl: '',
+        comparison: 'orderId',
+        columnIndexs: [0, 2, 3, 4, 5, 7, 13, 14, 16, 17, 18]
       },
       options2: {
         // second请求数据的地址
@@ -204,7 +183,9 @@ export default {
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap: {},
-      formLabelWidth: '125px'
+      formLabelWidth: '125px',
+      orderId: null,
+      placeId: null
     }
   },
   created() {
@@ -276,8 +257,6 @@ export default {
       var title = tableTitle
       let tHeader = []
       let filterVal = []
-      console.log('进入了导出')
-      console.log(columnData)
       columnData.forEach(e1 => {
         if (tHeader.indexOf(e1.label) === -1) {
           tHeader.push(e1.label)
@@ -408,9 +387,13 @@ export default {
     },
     //修改详单单价
     priceValueUpdate(row) {
+      this.orderId = row.orderId
       this.originalAddress = row.realAddress
       this.originalPriceValue = row.priceValue
       this.detailsId = row.detailsId
+
+      this.Address.requestUrl =
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
       this.dialogFormVisible = true
     },
     //运输订单点击浏览的事件
@@ -451,8 +434,9 @@ export default {
       if (this.place != null) {
         this.place = null
       }
-      ;(this.address = val.address), (this.addressId = val.addressId)
-
+      this.placeId = val.placeId
+      this.address = val.address
+      this.addressId = val.addressId
       this.priceId = val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
@@ -465,29 +449,82 @@ export default {
       } else {
         this.dialogFormVisible = false
         let mapValue = {
+          orderId: this.orderId,
           detailsId: this.detailsId,
-          priceId: this.priceId
+          priceId: this.priceId,
+          placeId: this.placeId
         }
         //是否确定修改详单地址!
-        this.$confirm('是否确定修改详单地址', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定修改', '提示', {
+          confirmButtonText: '仅修改单价',
+          cancelButtonText: '修改下货地址和单价',
+          distinguishCancelAndClose: true,
           type: 'warning',
           center: true
         })
           .then(() => {
             //初始化修改详单地址对话框的信息
-            ;(this.newPriceValue = null),
-              (this.newAddress = null),
-              (this.address = null),
-              (this.addresText = null),
-              (this.addressId = null),
-              (this.priceId = null),
+            this.newPriceValue = null
+            this.newAddress = null
+            this.address = null
+            this.addresText = null
+            this.addressId = null
+            this.priceId = null
+            this.axios
+              .post('/api/v1/bms/updateDetailsOrder', mapValue)
+              .then(res => {
+                if (res.data.code == '0') {
+                  this.$message.success('修改详单单价成功!')
+                  let startTime = null
+                  let endTime = null
+                  let carrierSsoId = null
+                  if (getCookie('orgCode') == 'chengyunshang') {
+                    carrierSsoId = getCookie('userId')
+                  }
+                  if (this.startTime && this.endTime) {
+                    startTime = sjTime(this.startTime)
+                    endTime = sjTime(this.endTime)
+                  }
+                  //重置未结算详单表单信息
+                  this.options1.requestUrl =
+                    '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
+                    this.input +
+                    '&startTime=' +
+                    startTime +
+                    '&endTime=' +
+                    endTime +
+                    '&status=0' +
+                    '&i=' +
+                    new Date()
+                } else {
+                  this.$message.error('修改详单单价失败,请联系管理员!')
+                }
+              })
+          })
+          .catch(action => {
+            if (action === 'cancel') {
+              mapValue.updatePlace = 1
+              this.newPriceValue = null
+              this.newAddress = null
+              this.address = null
+              this.addresText = null
+              this.addressId = null
+              this.priceId = null
               this.axios
                 .post('/api/v1/bms/updateDetailsOrder', mapValue)
                 .then(res => {
                   if (res.data.code == '0') {
-                    this.$message.success('修改详单单价成功!')
+                    this.$message.success('修改详单单价和地址成功!')
+                    let startTime = null
+                    let endTime = null
+                    let carrierSsoId = null
+                    if (getCookie('orgCode') == 'chengyunshang') {
+                      carrierSsoId = getCookie('userId')
+                    }
+                    if (this.startTime && this.endTime) {
+                      startTime = sjTime(this.startTime)
+                      endTime = sjTime(this.endTime)
+                    }
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
                       '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
@@ -499,16 +536,10 @@ export default {
                       '&status=0' +
                       '&i=' +
                       new Date()
-                  } else {
-                    this.$message.error('修改详单单价失败,请联系管理员!')
                   }
                 })
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '取消修改详单单价!'
-            })
+            }
+            //初始化修改详单地址对话框的信息
           })
       }
     }

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

@@ -116,6 +116,7 @@
         @row-click="rowClick"
         :cell-style="cellStyle"
         @filter-change="filterChange"
+        :lazy="true"
       >
         <el-table-column
           width="50"
@@ -137,6 +138,7 @@
           prop="saleOrderStatus"
           label="销售订单状态"
           width="100px"
+          align="center"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -154,9 +156,10 @@
         <el-table-column
           prop="areaName"
           label="销售片区"
-          width="160px"
+          width="150px"
           align="center"
-          show-overflow-tooltip
+          column-key="saleAreaList"
+          :filters="filterSaleAreaList"
         >
         </el-table-column>
         <el-table-column
@@ -183,13 +186,12 @@
         </el-table-column>
         <el-table-column
           prop="materialName"
+          column-key="materialNameList"
           label="物资名称"
           align="center"
           width="150px"
           sortable
-          show-overflow-tooltip
           :filters="filtermaterialNameList"
-          column-key="materialNameList"
         >
         </el-table-column>
         <el-table-column
@@ -770,7 +772,6 @@ import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
-import newNoticeVue from '../../../sale/components/dilNotice/newNotice.vue'
 export default {
   components: {
     PathView,
@@ -937,6 +938,7 @@ export default {
       filterCarrierList: [],
       filterCapacityList: [],
       filtermaterialNameList: [],
+      filterSaleAreaList: [],
       filterMap: {}
     }
   },
@@ -1011,6 +1013,18 @@ export default {
       ) {
         delete this.filterMap.consigneeNameList
       }
+      if (
+        typeof obj.saleAreaList != 'undefined' &&
+        obj.saleAreaList.length > 0
+      ) {
+        this.filterMap.saleAreaList = obj.saleAreaList
+      }
+      if (
+        typeof obj.saleAreaList != 'undefined' &&
+        obj.saleAreaList.length == 0
+      ) {
+        delete this.filterMap.saleAreaList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -1040,10 +1054,18 @@ export default {
         .filter(e => {
           return e != null
         })
+      let saleAreaList = this.tableData
+        .map(e => {
+          return e.areaName
+        })
+        .filter(e => {
+          return e != null
+        })
       this.filterConsigneeList = []
       this.filterCarrierList = []
       this.filterCapacityList = []
       this.filtermaterialNameList = []
+      this.filterSaleAreaList = []
       Array.from(new Set(consigneeNameList)).forEach(e => {
         let map = {}
         map.text = e
@@ -1068,6 +1090,12 @@ export default {
         map.value = e
         this.filtermaterialNameList.push(map)
       })
+      Array.from(new Set(saleAreaList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterSaleAreaList.push(map)
+      })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -2096,6 +2124,9 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    .el-tooltip {
+      width: auto !important;
+    }
     ::-webkit-scrollbar {
       // width: 20px;
       height: 20px;