提交代码

build/utils.js

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

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -198,7 +198,7 @@
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="手动车辆排队" name="fourth">
+          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -229,14 +229,14 @@
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="queueClick"
+                  @click="updateCanwork"
                   :disabled="disabled"
                   >确认</el-button
                 >
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="钢材车辆手动放行" name="fifth">
+          <el-tab-pane label="运输订单状态调整接口" name="eighth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -264,10 +264,14 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="poundNo from">
+                <span class="text">订单状态:</span>
+                <el-input v-model.number="orderStatus"></el-input>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="allowEnfactoryClick"
+                  @click="updateOrderStatus"
                   :disabled="disabled"
                   >确认</el-button
                 >
@@ -302,20 +306,21 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
-              <span class="text">进厂门岗:</span>
-              <el-select
-                v-model="enFactoryGatepost"
-                placeholder="请选择"
-                @change="onchangeGatepost(enFactoryGatepost)"
-              >
-                <el-option
-                  v-for="item in gatePostList"
-                  :key="item.gatepostId"
-                  :label="item.gatepostName"
-                  :value="item.gatepostName"
+              <div class="from">
+                <span class="text">进厂门岗:</span>
+                <el-select
+                  v-model="enFactoryGatepost"
+                  placeholder="请选择"
                 >
-                </el-option>
+                  <el-option
+                    v-for="item in gatePostList"
+                    :key="item.gatepostId"
+                    :label="item.gatepostName"
+                    :value="item.gatepostId"
+                  >
+                  </el-option>
               </el-select>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
@@ -326,7 +331,7 @@
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
+          <el-tab-pane label="车辆手动出厂" name="ninth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -354,17 +359,32 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="from">
+                <span class="text">出厂门岗:</span>
+                <el-select
+                  v-model="enFactoryGatepost"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in gatePostList"
+                    :key="item.gatepostId"
+                    :label="item.gatepostName"
+                    :value="item.gatepostId"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="updateCanwork"
+                  @click="leaveFactoryResultByPDA"
                   :disabled="disabled"
                   >确认</el-button
                 >
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="运输订单状态调整接口" name="eighth">
+          <el-tab-pane label="手动车辆排队" name="fourth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -392,14 +412,48 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="queueClick"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="钢材车辆手动放行" name="fifth">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
               <div class="poundNo from">
-                <span class="text">订单状态:</span>
-                <el-input v-model.number="orderStatus"></el-input>
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
               </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="updateOrderStatus"
+                  @click="allowEnfactoryClick"
                   :disabled="disabled"
                   >确认</el-button
                 >
@@ -481,20 +535,33 @@ export default {
           this.$router.go(0)
         })
     },
-    onchangeGatepost(value) {
-      console.log(value)
-      this.gatePostList.forEach(e => {
-        if (e.gatepostName == value) {
-          this.gatePostId = e.gatePostId
-        }
-      })
-    },
     enFactoryResultByPDA() {
       let map = {
         orderNumber: this.orderNumber + ' ',
-        gatepostId: this.gatePostId
+        gatepostId: this.enFactoryGatepost
       }
-      this.axios.post('')
+      this.axios.post('/api/v1/tms/enFactoryResultByPDA',map).then(res=>{
+        console.log(res);
+        if(res.data.status=='succeed'){
+          this.$message.success("进厂成功！");
+        }else{
+          this.$message.error("操作失败："+res.data.data);
+        }
+      });
+    },
+    leaveFactoryResultByPDA(){
+       let map = {
+        orderNumber: this.orderNumber + ' ',
+        gatepostId:  this.enFactoryGatepost
+      }
+      this.axios.post('/api/v1/tms/addLeaveFactoryResult',map).then(res=>{
+        console.log(res);
+        if(res.data.status=='succeed'){
+          this.$message.success("出厂成功！");
+        }else{
+          this.$message.error("操作失败："+res.data.data);
+        }
+      });
     },
     allowEnfactoryClick() {},
     queueClick() {

src/views/SporadicManage/components/oldAreaSporadic/transportOrder/transportOrder.vue

@@ -195,14 +195,14 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       startTime: null,
       endTime: null,
-      carrierUserId: "",
+      carrierUserId: '',
       //模态窗的框计算
       inputText: null,
       //车辆输入框
@@ -212,61 +212,61 @@ export default {
       //输入框的值
       input: null,
       //选项卡的当前选中的值
-      activeName: "first",
+      activeName: 'first',
       //已下发的表格
       first: {
-        requestUrl: ""
+        requestUrl: ''
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "",
+        requestUrl: '',
         // 控制显示当选列
-        selectionType: "radio"
+        selectionType: 'radio'
       },
       Received: {
-        requestUrl: ""
+        requestUrl: ''
       },
       completed: {
-        requestUrl: ""
+        requestUrl: ''
       },
       refused: {
-        requestUrl: ""
+        requestUrl: ''
       },
       //车辆的表格
       truck: {
-        requestUrl: "",
-        selectionType: "radio"
+        requestUrl: '',
+        selectionType: 'radio'
       },
       //记录旧的row对象
-      oldRow: "",
+      oldRow: '',
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
       oldRowCount: 1,
       //记录旧的row对象
-      oldRow1: "",
+      oldRow1: '',
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
       oldRowCount1: 1,
-      oldRow2: "",
+      oldRow2: '',
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
       oldRowCount2: 1,
       tableHead: [
         {
-          prop: "materialName",
-          label: "物资名称",
+          prop: 'materialName',
+          label: '物资名称',
           width: 150
         },
         {
-          prop: "specificationModel",
-          label: "规格型号",
+          prop: 'specificationModel',
+          label: '规格型号',
           width: 150
         },
         {
-          prop: "materialNumber",
-          label: "物资件数",
+          prop: 'materialNumber',
+          label: '物资件数',
           width: 100
         },
         {
-          prop: "materialWeight",
-          label: "物资重量",
+          prop: 'materialWeight',
+          label: '物资重量',
           width: 100
         }
       ],
@@ -276,560 +276,560 @@ export default {
       //当前选中的订单id
       selectOrderId: null,
       //选中的车辆号
-      capacityNumber: "",
+      capacityNumber: '',
       //选中的运力id
       capacityId: null,
       //是否关闭模态框
       drawer: false,
       //模态框从左往右打开
-      direction: "rtl",
+      direction: 'rtl',
 
       orderId: null,
       //多选的选中的订单id
       selectionList: [],
       //区别点击的是添加运力，还是修改
       index: null
-    };
+    }
   },
   created() {
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId");
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+        getCookie('userId')
     } else {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' + null
     }
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.first.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=' +
+        getCookie('userId')
       this.Received.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=' +
+        getCookie('userId')
       this.completed.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=' +
+        getCookie('userId')
       this.refused.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=' +
+        getCookie('userId')
     } else if (
-      getCookie("orgCode") == "dagangadmin" ||
-      getCookie("orgCode") == "zidonghuabu" ||
-      getCookie("orgCode") == "wuliuchuyunzhongxin"
+      getCookie('orgCode') == 'dagangadmin' ||
+      getCookie('orgCode') == 'zidonghuabu' ||
+      getCookie('orgCode') == 'wuliuchuyunzhongxin'
     ) {
       this.first.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4";
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4'
       this.Received.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5";
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5'
       this.completed.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2";
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2'
       this.refused.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6";
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6'
     } else {
       this.first.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=' +
+        getCookie('orgCode')
       this.Received.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=' +
+        getCookie('orgCode')
       this.completed.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=' +
+        getCookie('orgCode')
       this.refused.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=' +
+        getCookie('orgCode')
     }
   },
   methods: {
     //撤销已拒绝的运输订单
     ctrlZClick(scope) {
-      console.log(scope.row.orderId);
+      console.log(scope.row.orderId)
       this.axios
-        .post("/api/v1/oms/refuseCtrlZ", {
+        .post('/api/v1/oms/refuseCtrlZ', {
           orderId: scope.row.orderId
         })
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("撤单成功");
-            this.getRequestUrl();
+          if (res.data.code == '200') {
+            this.$message.success('撤单成功')
+            this.getRequestUrl()
           }
-        });
+        })
     },
     handleClose(done) {
-      done();
-      this.$message.info("取消修改运力");
+      done()
+      this.$message.info('取消修改运力')
     },
     onclick() {
-      let startTime = null;
-      let endTime = null;
+      let startTime = null
+      let endTime = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       } else if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       } else {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&con=" +
+          '&con=' +
           this.input +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       }
     },
     getRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" +
-          getCookie("userId") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=' +
+          getCookie('userId') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       } else if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       } else {
         this.first.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
         this.refused.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" +
-          getCookie("orgCode") +
-          "&startTime=" +
+          '/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=' +
+          getCookie('orgCode') +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       }
     },
     getTruckRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-          getCookie("userId") +
-          "&test=" +
-          new Date();
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+          getCookie('userId') +
+          '&test=' +
+          new Date()
       } else {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
           null +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       }
     },
     currentRadioChange1(row) {
-      console.log(row);
-      this.capacityId = row.capacityId;
+      console.log(row)
+      this.capacityId = row.capacityId
     },
     //删除运输订单
     deleteClick(scope) {
       let map = {
         orderId: scope.row.orderId,
-        userId: getCookie("userId")
-      };
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+        userId: getCookie('userId')
+      }
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+          this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
             if (res.data.code == 200) {
               this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.getRequestUrl();
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getRequestUrl()
             } else {
               this.$message({
-                message: "删除失败",
-                type: "warning"
-              });
+                message: '删除失败',
+                type: 'warning'
+              })
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
     //修改运输订单
     updateClick(scope) {
-      this.getTruckRequestUrl();
-      this.orderId = scope.row.orderId;
-      this.dialogTableVisible = true;
-      console.log(scope.row.orderId);
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
     },
     updateTruckCapacity() {
       if (this.capacityId == null) {
-        this.$message.error("未选中运力");
-        return;
+        this.$message.error('未选中运力')
+        return
       }
       this.axios
-        .post("/api/v1/oms/updateCapacityId", {
+        .post('/api/v1/oms/updateCapacityId', {
           capacityId: this.capacityId,
           orderId: this.orderId
         })
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("修改运力成功");
-            this.getRequestUrl();
-            this.dialogTableVisible = false;
+          if (res.data.code == '200') {
+            this.$message.success('修改运力成功')
+            this.getRequestUrl()
+            this.dialogTableVisible = false
           } else {
-            this.$message.error("修改运力失败");
+            this.$message.error('修改运力失败')
           }
-        });
+        })
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     Insert() {
-      this.$router.push("addOldSporadicOrder");
+      this.$router.push('addOldSporadicOrder')
     },
     getCapacity() {
       if (this.truckText != null) {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&index=" +
-            this.truckText;
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&index=' +
+            this.truckText
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&index=" +
-            this.truckText;
+            '&index=' +
+            this.truckText
         }
-        this.truckText = null;
+        this.truckText = null
       } else {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&i=" +
-            new Date();
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&i=' +
+            new Date()
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
         }
       }
     },
     //获取物资详情--未接收
     getMatrialDetails1(row) {
-      console.log(row);
+      console.log(row)
       // 记录重复点击次数
       if (this.oldRow === row) {
-        this.oldRowCount += 1;
+        this.oldRowCount += 1
       }
       // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
+      this.$refs.table.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
+      if (this.oldRow != '') {
         if (this.oldRow != row) {
           if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
+            this.$refs.table.toggleRowExpansion(this.oldRow)
           } else {
-            this.oldRowCount = 1;
+            this.oldRowCount = 1
           }
         } else {
-          this.oldRow = null;
-          return;
+          this.oldRow = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow = row;
+      this.oldRow = row
       this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .post('/api/v1/ams/getSporadic?sporadicId=' + row.sporadicOrderId)
         .then(res => {
-          console.log(res.data.data);
-          this.tableData = res.data.data;
-        });
+          console.log(res.data.data)
+          this.tableData = res.data.data
+        })
     },
     //获取物资详情--已接收
     getMatrialDetails2(row) {
-      console.log(row);
+      console.log(row)
       // 记录重复点击次数
       if (this.oldRow1 === row) {
-        this.oldRowCount1 += 1;
+        this.oldRowCount1 += 1
       }
       // 切换当前详情表
-      this.$refs.table1.toggleRowExpansion(row);
+      this.$refs.table1.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow1 != "") {
+      if (this.oldRow1 != '') {
         if (this.oldRow1 != row) {
           if (this.oldRowCount1 % 2 === 1) {
-            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+            this.$refs.table1.toggleRowExpansion(this.oldRow1)
           } else {
-            this.oldRowCount1 = 1;
+            this.oldRowCount1 = 1
           }
         } else {
-          this.oldRow1 = null;
-          return;
+          this.oldRow1 = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow1 = row;
+      this.oldRow1 = row
       this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .post('/api/v1/ams/getSporadic?sporadicId=' + row.sporadicOrderId)
         .then(res => {
-          console.log(res.data.data);
-          this.tableData1 = res.data.data;
-        });
+          console.log(res.data.data)
+          this.tableData1 = res.data.data
+        })
     },
     //获取物资详情--已完成
     getMatrialDetails3(row) {
-      console.log(row);
+      console.log(row)
       // 记录重复点击次数
       if (this.oldRow2 === row) {
-        this.oldRowCount2 += 1;
+        this.oldRowCount2 += 1
       }
       // 切换当前详情表
-      this.$refs.table2.toggleRowExpansion(row);
+      this.$refs.table2.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow2 != "") {
+      if (this.oldRow2 != '') {
         if (this.oldRow2 != row) {
           if (this.oldRowCount2 % 2 === 1) {
-            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+            this.$refs.table2.toggleRowExpansion(this.oldRow2)
           } else {
-            this.oldRowCount2 = 1;
+            this.oldRowCount2 = 1
           }
         } else {
-          this.oldRow2 = null;
-          return;
+          this.oldRow2 = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow2 = row;
+      this.oldRow2 = row
       this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .post('/api/v1/ams/getSporadic?sporadicId=' + row.sporadicOrderId)
         .then(res => {
-          this.tableData2 = res.data.data;
-        });
+          this.tableData2 = res.data.data
+        })
     }
   }
-};
+}
 </script>
 
 <style lang="scss">

src/views/TMS/components/importedMine/entrust.vue

@@ -76,6 +76,9 @@ export default {
         requestUrl: "/api/v1/tms/getWeightResult?apiId=491&resultType=1",
         // 控制显示多选列
         selectionType: "select",
+        maxHeight:500,
+        isshowSummary:true,
+        showSummaryList:['resultBillableTonnage','resultGrossWeight','resultNetWeight','resultTareWeight']
       },
       selectionListMap: [],
       selectionListMap2: [],

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -2035,8 +2035,6 @@ export default {
             var orderPlanWeightAllFill = 0
             //初始化maplist
             this.selectionList = this.temporarylist
-            console.log('以下是修改过后的数据')
-            console.log(this.selectionList)
             var mapList = []
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {

src/views/appoint/components/saleContract/saleOrderOODetails.vue

@@ -46,15 +46,7 @@
             >
               修改
             </el-button>
-            <el-button
-              @click="deleteClick(scope)"
-              type="text"
-              size="small"
-              v-if="
-                scope.row.carStatus == '未接单' ||
-                  scope.row.carStatus == '未进厂'
-              "
-            >
+            <el-button @click="deleteClick(scope)" type="text" size="small">
               关闭
             </el-button>
           </template>
@@ -65,11 +57,11 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
-      carrierUserId: "",
+      carrierUserId: '',
       //模态窗的框计算
       inputText: null,
       //车辆输入框
@@ -77,181 +69,184 @@ export default {
       //是否弹出对话框
       dialogTableVisible: false,
       //输入框的值
-      input: "",
+      input: '',
       //选项卡的当前选中的值
-      activeName: "first",
+      activeName: 'first',
       //已下发的表格
       first: {
-        requestUrl: "",
-        comparison: "orderNumber",
+        requestUrl: '',
+        comparison: 'orderNumber',
         orderNumber: [0, 1]
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "",
+        requestUrl: '',
         // 控制显示当选列
-        selectionType: "radio"
+        selectionType: 'radio'
       },
       //当前选中的订单id
       selectOrderId: null,
       //选中的车辆号
-      capacityNumber: "",
+      capacityNumber: '',
       //选中的运力id
       capacityId: null,
       //是否关闭模态框
       drawer: false,
       //模态框从左往右打开
-      direction: "rtl",
+      direction: 'rtl',
       orderId: null,
       //区别点击的是添加运力，还是修改
       index: null
-    };
+    }
   },
   created() {
-    this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429";
+    this.truck.requestUrl = '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429'
     this.first.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-      "&saleOrderId=" +
-      this.$route.params.saleOrderId;
+      '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+      '&saleOrderId=' +
+      this.$route.params.saleOrderId
   },
   methods: {
     onclick() {
       this.first.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-        "&saleOrderId=" +
+        '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+        '&saleOrderId=' +
         this.$route.params.saleOrderId +
-        "&con=" +
+        '&con=' +
         this.input +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     back() {
-      this.$router.go(-1);
+      this.$router.go(-1)
     },
     handleClose(done) {
-      done();
-      this.$message.info("取消修改运力");
+      done()
+      this.$message.info('取消修改运力')
     },
     getRequestUrl() {
       this.first.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-        "&saleOrderId=" +
+        '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+        '&saleOrderId=' +
         this.$route.params.saleOrderId +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     getTruckRequestUrl() {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
         null +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     currentRadioChange1(row) {
-      console.log(row);
-      this.capacityId = row.capacityId;
+      console.log(row)
+      this.capacityId = row.capacityId
     },
     //删除运输订单
     deleteClick(scope) {
+      console.log(scope.row.orderNumber)
+      let orderId = scope.row.orderNumber.substring(15)
+      console.log(orderId)
       let map = {
-        orderId: scope.row.orderId,
-        userId: getCookie("userId")
-      };
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+        orderId: scope.row.orderId || orderId,
+        userId: getCookie('userId')
+      }
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+          this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
             if (res.data.code == 200) {
               this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.getRequestUrl();
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getRequestUrl()
             } else {
               this.$message({
-                message: "删除失败",
-                type: "warning"
-              });
+                message: '删除失败',
+                type: 'warning'
+              })
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
     //修改运输订单
     updateClick(scope) {
-      this.getTruckRequestUrl();
-      this.orderId = scope.row.orderId;
-      this.dialogTableVisible = true;
-      console.log(scope.row.orderId);
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
     },
     updateTruckCapacity() {
       if (this.capacityId == null) {
-        this.$message.error("未选中运力");
-        return;
+        this.$message.error('未选中运力')
+        return
       }
       this.axios
-        .post("/api/v1/oms/updateCapacityId", {
+        .post('/api/v1/oms/updateCapacityId', {
           capacityId: this.capacityId,
           orderId: this.orderId
         })
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("修改运力成功");
-            this.getRequestUrl();
-            this.dialogTableVisible = false;
+          if (res.data.code == '200') {
+            this.$message.success('修改运力成功')
+            this.getRequestUrl()
+            this.dialogTableVisible = false
           } else {
-            this.$message.error("修改运力失败");
+            this.$message.error('修改运力失败')
           }
-        });
+        })
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     Insert() {
-      this.$router.push("addOldSporadicOrder");
+      this.$router.push('addOldSporadicOrder')
     },
     getCapacity() {
       if (this.truckText != null) {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&index=" +
-            this.truckText;
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&index=' +
+            this.truckText
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&index=" +
-            this.truckText;
+            '&index=' +
+            this.truckText
         }
-        this.truckText = null;
+        this.truckText = null
       } else {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&i=" +
-            new Date();
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&i=' +
+            new Date()
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
         }
       }
     }
   }
-};
+}
 </script>
 
 <style lang="scss">

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

@@ -2776,8 +2776,8 @@ export default {
         endTime = sjTime(this.endTime)
       }
       let map= {
-        saleOrderMaterialIds:this.visibleList.map(e=>{
-          return e.saleOrderMaterialId
+        saleMaterialIds:this.visibleList.map(e=>{
+          return e.saleMaterialId
         })
       }
       console.log("map:",map);
@@ -2794,7 +2794,7 @@ export default {
           this.visibleList.forEach(e1=>{
             //遍历新数组
             let temp = res.data.data.find(e2=>{
-              return e1.saleOrderMaterialId==e2.saleOrderMaterialId
+              return e1.saleMaterialId==e2.saleMaterialId
             })
             //赋值
             e1.priceValue=temp.priceValue;

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

@@ -105,6 +105,24 @@
             <i class="el-icon-document"></i>签收抵达</el-button
           >
         </el-form-item>
+        <el-form-item v-if="isShowOperate">
+          <el-button
+            type="primary"
+            @click="batchCarrier()"
+            v-if="!notRoutList.includes('batchCarrier')"
+          >
+            <i class="el-icon-share"></i>批量授权</el-button
+          >
+        </el-form-item>
+        <el-form-item v-if="isShowOperate">
+          <el-button
+            type="primary"
+            @click="getMakeDate()"
+            v-if="!notRoutList.includes('batchCarrier')"
+          >
+            <i class="el-icon-finished"></i>获取制单日期</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <label
             class="el-form-item__label"
@@ -134,7 +152,14 @@
         id="salesLogisticsStat_saleSteelReports_table"
         individual-panel
         @resetTable="reset"
+        @selection-change="handleSelectionChange()"
       >
+        <el-table-column
+          type="selection"
+          width="30"
+          label="选择"
+          v-if="!notRoutList.includes('select')"
+        ></el-table-column>
         <el-table-column
           width="50"
           label="序号"
@@ -151,6 +176,13 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="saleMakeDate"
+          label="制单日期"
+          width="130px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="saleOrderStatus"
           column-key="saleOrderStatus"
@@ -164,12 +196,11 @@
         <el-table-column
           prop="consigneeName"
           label="客户"
-          width="160px"
+          width="180px"
           align="center"
           column-key="consigneeName"
           :filters="filterConsigneeList"
           sortable
-          show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
@@ -362,6 +393,14 @@
           label="实际运费"
           width="100px"
         ></el-table-column>
+          <el-table-column
+          prop="isAccept"
+          label="异地库接收标志"
+          width="60px"
+          show-overflow-tooltip
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="orderNo"
           label="运输订单号"
@@ -1097,6 +1136,23 @@
     <el-dialog :visible.sync="dialogVisible" width="80%">
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
+    <el-dialog :visible.sync="batchCarrierVisible" width="30%" center>
+      <div>批量授权承运商</div>
+      <el-form>
+        <el-form-item>
+          <el-autocomplete
+            style="width:250px"
+            v-model="batchCarrierName"
+            :fetch-suggestions="querySearchCarrier"
+            placeholder="请输入承运商"
+            @select="handleSelectCarrier"
+          >
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-button @click="batchCarrierVisible = false">取 消</el-button>
+      <el-button type="primary" @click="batchCarrierMakeSure">确 定</el-button>
+    </el-dialog>
   </div>
 </template>
 
@@ -1113,6 +1169,8 @@ export default {
   },
   data() {
     return {
+      batchCarrierName: null,
+      batchCarrierVisible: false,
       batchAddressProvince: '',
       batchAddressDistrict: '',
       batchAddressTown: '',
@@ -1216,7 +1274,8 @@ export default {
         '系统建议运价',
         '摘要',
         '排队开始时间',
-        '钢材科放行时间'
+        '钢材科放行时间',
+        '异地库接收标志'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -1281,7 +1340,6 @@ export default {
       orgCodeList: [
         'wuliuyunshubu',
         'dagangadmin',
-        'shichangxinxibu',
         'zidonghuabu',
         'chengyunshang'
       ],
@@ -1321,6 +1379,7 @@ export default {
       originalAddress: null,
       aaadrawer: false,
       downloadCapacityNo: null,
+      batchCarrierList: [],
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -1355,16 +1414,18 @@ export default {
         'closeOrder',
         'materialNum',
         'closeEntry',
-        'capacityNo'
+        'capacityNo',
+        'batchCarrier',
+        'select'
       ]
     }
     //只要涉及提交即必须设计防抖,在初始化时绑定防抖函数
     this.updateCapacityDebounce = this.debounce(() => {
       this.updateCapacity()
-    }, 3000)
+    }, 1500)
     this.updateTruckCarrierDebounce = this.debounce(() => {
       this.updateTruckCarrier()
-    }, 3000)
+    }, 1500)
     this.cellMouse1 = this.debounce((row, column, cell) => {
       this.cellMouse(row, column, cell)
     }, 100)
@@ -1437,6 +1498,97 @@ export default {
   },
   computed: {},
   methods: {
+    getMakeDate() {
+      if (this.$refs.tableRef.selection.length > 0) {
+        let easPrimaryList = []
+        easPrimaryList = this.$refs.tableRef.selection.map(e => {
+          return e.closeEntryId
+        })
+        this.axios
+          .post(
+            '/api/v1/ams/getMakeOrderDate',
+            {
+              easPrimaryList: easPrimaryList
+            },
+            { timeout: 3 * 60 * 1000 }
+          )
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message({
+                message: '获取成功',
+                type: 'success',
+                duration: '2500',
+                offset: '250'
+              })
+              this.getSteelReport()
+            }
+          })
+      }
+    },
+    batchCarrierMakeSure() {
+      console.log(this.batchCarrierName)
+      let batchCarrierId = null
+      this.carrierList.forEach(item => {
+        if (item.carrierName == this.batchCarrierName) {
+          batchCarrierId = item.carrierId
+        }
+      })
+      this.batchCarrierList.forEach(e => {
+        e.carrierId = batchCarrierId
+      })
+      const loading = this.$loading({
+        lock: true,
+        text: '正在批量授权承运商',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.axios
+        .post('/api/v1/ams/dispatchToCarrier', this.batchCarrierList)
+        .then(res => {
+          if (res.data.code == '0') {
+            this.$message.success('授权承运商成功')
+            this.batchCarrierList = []
+            this.batchCarrierVisible = false
+            this.getSteelReport()
+            loading.close()
+          } else {
+            this.$message.error('授权失败,请联系管理员')
+            this.batchCarrierList = []
+            this.batchCarrierVisible = false
+            this.getSteelReport()
+            loading.close()
+          }
+        })
+        .catch(() => {
+          this.$message.error('授权失败,请联系管理员')
+          this.batchCarrierList = []
+          this.batchCarrierVisible = false
+          this.getSteelReport()
+          loading.close()
+        })
+    },
+    batchCarrier() {
+      if (this.batchCarrierList.length > 0) {
+        this.batchCarrierVisible = true
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请选择要批量授权的订单',
+          offset: '250',
+          duration: '2500'
+        })
+      }
+    },
+    handleSelectionChange() {
+      console.log(this.$refs.tableRef.selection, 'selection')
+      this.batchCarrierList = []
+      this.batchCarrierList = this.$refs.tableRef.selection.map(e => {
+        let map = {}
+        map.saleOrderMaterialId = e.saleOrderMaterialId
+        return map
+      })
+      console.log(this.batchCarrierList)
+    },
     receiveClick(src, title) {
       // this.dialogImageUrl = src
       downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')
@@ -2759,7 +2911,9 @@ export default {
       //通过车序号的个数来计算车数
       let arr = []
       arr = data.map(e => {
-        return e.saleOrderMaterialId
+        if (e.capacityNo != '取消') {
+          return e.saleOrderMaterialId
+        }
       })
       this.totalCapacity = Array.from(new Set(arr)).length
       this.totalNumber = data.reduce(function(prev, item) {
@@ -3038,6 +3192,7 @@ export default {
           this.tableData = res.data.data
           this.totalHeight += this.itemHeight
           this.visibleList = []
+          this.maxHeight = window.innerHeight - 130
           this.visibleList = this.tableData.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
@@ -3045,8 +3200,7 @@ export default {
           console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
-          console.log(this.maxHeight, 'this.maxHeight')
-          this.maxHeight = window.innerHeight - 130
+
           console.log(this.maxHeight, 'this.maxHeight')
           loading.close()
         })