luobang 2 tahun lalu
induk
melakukan
61571b4fa7

+ 2 - 2
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', 'queue','inward','appoint','sale','RMS','AMS']
-let devModules = ['all']
+let devModules = ['index', 'statisticalReport', 'queue', 'sale']
+// let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 2 - 2
config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址r
   '/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.104:8080',
     ws: true,
     pathRewrite: {

+ 61 - 9
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -98,6 +98,11 @@
             ><i class="el-icon-map-location"></i>实时路径</el-button
           > -->
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="makeSurePrice"
+            ><i class="el-icon-circle-check"></i>确认执行价</el-button
+          >
+        </el-form-item>
         <!-- <el-form-item v-if="isShowOperate">
           <el-button type="primary" @click="openReceive()">
             <i class="el-icon-document"></i>签收抵达</el-button
@@ -131,7 +136,10 @@
         id="salesLogisticsStat_saleSteelReports_table"
         individual-panel
         @resetTable="reset"
+        @selection-change="handleSelectionChange()"
       >
+        <el-table-column type="selection" width="30" label="选择">
+        </el-table-column>
         <el-table-column
           width="50"
           label="序号"
@@ -420,7 +428,7 @@
           <div class="steelMapClass3">
             <div class="steelMapClass33">
               <span>承运商:</span>
-              <span>{{steelMap.carrierName}}</span>
+              <span>{{ steelMap.carrierName }}</span>
               <span style="margin-left: 30px;">车牌号:</span>
               <span>{{ steelMap.capacityNo }}</span>
               <span style="margin-left: 30px;">司机电话:</span>
@@ -620,12 +628,12 @@
       >
       <div>
         <!-- 查询所有的运输单价 -->
-          <dilTable
-            v-bind.sync="Address"
-            @radio-change="currentRadioChange2"
-            :drawer="aaadrawer"
-            style="overflow-y:scroll"
-          ></dilTable>
+        <dilTable
+          v-bind.sync="Address"
+          @radio-change="currentRadioChange2"
+          :drawer="aaadrawer"
+          style="overflow-y:scroll"
+        ></dilTable>
       </div>
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -903,7 +911,7 @@ export default {
       Address: {
         requestUrl: '',
         selectionType: 'radio',
-        maxHeight:300
+        maxHeight: 300
       },
       dialogFormVisible: false,
       addresText: null,
@@ -911,6 +919,7 @@ export default {
       originalAddress: null,
       aaadrawer: false,
       downloadCapacityNo: null,
+      makeSurePriceOrderList: [],
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -1027,6 +1036,49 @@ export default {
   },
   computed: {},
   methods: {
+    handleSelectionChange() {
+      this.makeSurePriceOrderList = []
+      console.log(this.$refs.tableRef.selection, 'selection')
+      this.makeSurePriceOrderList = this.$refs.tableRef.selection.map(e => {
+        return e.orderId
+      })
+      console.log(this.makeSurePriceOrderList)
+    },
+    makeSurePrice() {
+      let map = {
+        orderList: this.makeSurePriceOrderList
+      }
+      this.axios
+        .post('/api/v1/bms/updateDetailsStatus', map)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$refs.tableRef.clearSelection()
+            this.getSteelReport()
+            this.makeSurePriceOrderList = []
+            this.$message({
+              type: 'success',
+              message: '确认执行价成功',
+              duration: 2000,
+              offset: '250'
+            })
+          } else {
+            this.$message({
+              type: 'error',
+              message: '修改失败,联系管理员',
+              duration: 2000,
+              offset: '250'
+            })
+          }
+        })
+        .catch(e => {
+          this.$message({
+            type: 'error',
+            message: '修改失败,联系管理员',
+            duration: 2000,
+            offset: '250'
+          })
+        })
+    },
     receiveClick(src, title) {
       // this.dialogImageUrl = src
       downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')
@@ -1045,7 +1097,7 @@ export default {
     updateDetailsOrderPrice() {
       this.originalAddress = this.steelMap.addressPlace
       this.originalPriceValue = this.steelMap.priceValue
-      console.log("数据是否正确")
+      console.log('数据是否正确')
       console.log(this.originalAddress)
       console.log(this.originalPriceValue)
       this.Address.requestUrl =