das

build/utils.js

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

src/views/inward/components/inwardBillet/addInwardBillet.vue

@@ -192,7 +192,7 @@
           <el-date-picker
             v-model="startTime"
             type="date"
-            placeholder="选择日期"
+            placeholder="开始日期"
             style="width:150px"
           >
           </el-date-picker>
@@ -200,12 +200,12 @@
           <el-date-picker
             v-model="endTime"
             type="date"
-            placeholder="选择日期"
+            placeholder="结束日期"
             style="width:150px"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="选择班别" style="margin-left:10px">
+        <el-form-item label="班别" style="margin-left:10px">
           <el-select
             class="inline-select"
             v-model="clazz"
@@ -221,7 +221,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="选择班次" style="margin-left:10px">
+        <el-form-item label="班次" style="margin-left:10px">
           <el-select
             class="inline-select"
             v-model="shift"
@@ -237,6 +237,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="炉号" style="margin-left:10px">
+          <el-input
+            v-model="queryHeatNo"
+            style="width:250px"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item
           ><el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i> </el-button
@@ -271,6 +278,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      queryHeatNo: null,
       startTime: null,
       endTime: null,
       checkWeight: null,
@@ -434,6 +442,10 @@ export default {
       if (this.shift) {
         obj.shift = this.shift
       }
+      if (this.queryHeatNo) {
+        console.log(this.queryHeatNo)
+        obj.queryHeatNo = this.queryHeatNo
+      }
       this.first.requestQuery = obj
       this.first.requestUrl =
         '/api/v1/ams/getBilletRequirementList?apiId=518&startTime=' +

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

@@ -302,12 +302,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="receiptTime"
-          label="抵达时间"
-          width="280px"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="receiptTime" label="抵达时间" width="150px">
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
@@ -316,19 +311,20 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="arrivalTime"
-          label="签收时间"
-          width="280px"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="arrivalTime" label="签收时间" width="150px">
         </el-table-column>
+        <el-table-column prop="priceValue" label="系统建议运价" width="100px">
+        </el-table-column>
+        <el-table-column
+          prop="detailsAmount"
+          label="系统建议运费"
+          width="100px"
+        ></el-table-column>
         <el-table-column
           prop="orderNo"
           label="运输订单号"
           width="180px"
           align="center"
-          show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
@@ -336,22 +332,15 @@
           label="司机电话"
           width="120px"
           align="center"
-          show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="saler"
-          label="业务员"
-          align="center"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
           prop="shipperName"
           label="发货单位"
           width="170px"
           align="center"
-          show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
@@ -359,7 +348,6 @@
           label="收货客户电话"
           width="120px"
           align="center"
-          show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
@@ -369,13 +357,12 @@
           label="销售订单号"
           width="200px"
           align="center"
-          show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
           prop="closeEntryId"
           label="金蝶分录ID"
-          width="100px"
+          width="120px"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -631,6 +618,19 @@
               <span>{{ steelMap.receiptAddress }}</span>
             </div>
           </div>
+          <div class="steelMapClass7">
+            <div class="steelMapClass72" v-if="steelMap.priceValue != null">
+              <span>系统建议运价:</span>
+              <span>{{ steelMap.priceValue }}</span>
+              <el-button
+                type="success"
+                circle
+                @click="updateDetailsOrderPrice"
+                v-if="!notRoutList.includes('capacityNo')"
+                >修改</el-button
+              >
+            </div>
+          </div>
         </div>
         <div class="table1">
           <el-table
@@ -705,6 +705,8 @@
             <el-table-column prop="netWeight" label="净重"> </el-table-column>
             <el-table-column prop="loadTime" label="装货时间" width="130px">
             </el-table-column>
+            <el-table-column prop="detailsAmount" label="运费" width="130px">
+            </el-table-column>
             <el-table-column
               prop="closeEntryId"
               label="金蝶分录ID"
@@ -928,6 +930,50 @@
         ><currentLocation :carNumber="carNumber"></currentLocation
       ></vxe-modal>
     </div>
+    <el-drawer
+      title="修改详单地址"
+      :visible.sync="dialogFormVisible"
+      size="40%"
+    >
+      <!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
+      原详单地址
+      <el-input
+        style="width:250px"
+        v-model="originalAddress"
+        disabled
+      ></el-input>
+      <label>原单价</label>
+      <el-input
+        style="width:100px"
+        v-model="originalPriceValue"
+        disabled
+      ></el-input>
+      <!--        </el-form-item>-->
+      <!---->
+      <el-input
+        v-model="addresText"
+        placeholder="请输入内容"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        @keyup.native.enter="selectAddresClick"
+      ></el-input>
+      <el-button type="primary" @click="selectAddresClick"
+        ><i class="el-icon-search"></i>查询</el-button
+      >
+      <div class="tablecls">
+        <!-- 查询所有的运输单价 -->
+        <vue-scorll :ops="ops" style="width: 100%;height: 100%">
+          <dilTable
+            v-bind.sync="Address"
+            @radio-change="currentRadioChange2"
+            :drawer="aaadrawer"
+          ></dilTable>
+        </vue-scorll>
+      </div>
+      <div class="opreation">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="makeSure">确 定</el-button>
+      </div>
+    </el-drawer>
     <el-dialog
       title="抵达签收"
       :visible.sync="arrivalReceiving"
@@ -944,7 +990,7 @@
         <el-form-item label="签收地址">
           <el-input v-model="location" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="抵达图片（满货箱）">
+        <el-form-item label="抵达图片">
           <el-upload
             ref="arrival"
             list-type="picture-card"
@@ -1100,7 +1146,8 @@ export default {
         '短信发送',
         '销售片区',
         '抵达时间',
-        '签收时间'
+        '签收时间',
+        '系统建议运价'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -1191,7 +1238,30 @@ export default {
       dialogImageUrl: '',
       dialogVisible: false,
       isLoading: false,
-      batchList: []
+      batchList: [],
+      Address: {
+        requestUrl: '',
+        selectionType: 'radio'
+      },
+      dialogFormVisible: false,
+      addresText: null,
+      originalPriceValue: null,
+      originalAddress: null,
+      aaadrawer: false,
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: '#5f9ea0', //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          'overflow-x': 'hidden'
+        }
+      }
     }
   },
   created() {
@@ -1288,6 +1358,82 @@ export default {
   },
   computed: {},
   methods: {
+    selectAddresClick() {
+      if (this.addresText) {
+        this.Address.requestUrl =
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=' +
+          this.addresText
+      } else {
+        this.Address.requestUrl =
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
+      }
+    },
+    updateDetailsOrderPrice() {
+      this.originalAddress = this.steelMap.addressPlace
+      this.originalPriceValue = this.steelMap.priceValue
+      this.Address.requestUrl =
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
+      this.dialogFormVisible = true
+    },
+    currentRadioChange2(val) {
+      //若具体地址有值，清空值
+      if (this.place != null) {
+        this.place = null
+      }
+      this.steelMap.placeId = val.placeId
+      this.steelMap.address = val.address
+      this.steelMap.addressId = val.addressId
+      this.steelMap.priceId = val.priceid
+    },
+    makeSure() {
+      //若没有单价Id
+      let mapValue = {
+        orderId: this.steelMap.orderId,
+        priceId: this.steelMap.priceId,
+        placeId: this.steelMap.placeId
+      }
+      //是否确定修改详单地址!
+      this.$confirm('确定修改', '提示', {
+        confirmButtonText: '仅修改单价',
+        cancelButtonText: '修改下货地址和单价',
+        distinguishCancelAndClose: true,
+        type: 'warning',
+        center: true
+      })
+        .then(() => {
+          //初始化修改详单地址对话框的信息
+          this.axios
+            .post('/api/v1/bms/updateDetailsOrder', mapValue)
+            .then(res => {
+              if (res.data.code == '0') {
+                this.$message.success('修改详单单价成功!')
+                //重置未结算详单表单信息
+                this.operation(this.steelMap)
+                this.getSteelReport()
+                this.dialogFormVisible = false
+              } else {
+                this.$message.error('修改详单单价失败,请联系管理员!')
+                this.dialogFormVisible = false
+              }
+            })
+        })
+        .catch(action => {
+          if (action === 'cancel') {
+            mapValue.updatePlace = 1
+            this.axios
+              .post('/api/v1/bms/updateDetailsOrder', mapValue)
+              .then(res => {
+                if (res.data.code == '0') {
+                  this.$message.success('修改详单单价和地址成功!')
+                  this.operation(this.steelMap)
+                  this.getSteelReport()
+                  this.dialogFormVisible = false
+                }
+              })
+          }
+          //初始化修改详单地址对话框的信息
+        })
+    },
     hanleScroll() {
       console.log('我滚动了')
     },
@@ -2556,6 +2702,7 @@ export default {
       let remark = null
       let saler = null
       let easPrimaryId = null
+      let consigneeSsoId = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -2566,6 +2713,10 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        consigneeSsoId = getCookie('userId')
+        obj.consigneeSsoId = consigneeSsoId
+      }
       if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
@@ -2735,7 +2886,11 @@ export default {
     /deep/ .el-table__body {
       overflow-y: auto;
       position: absolute !important;
+      tr:hover > td {
+        background-color: #fff;
+      }
     }
+
     ::-webkit-scrollbar {
       // width: 20px;
       height: 20px;
@@ -2839,6 +2994,19 @@ export default {
           margin-right: 10px;
         }
       }
+
+      .steelMapClass7 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass72 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+      }
     }
     .table1 {
       margin-left: 20px;