时间

build/check-versions.js

@@ -40,7 +40,7 @@ module.exports = function () {
 
   if (warnings.length) {
     console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log(chalk.yellow('若要使用此模板，必须更新以下模块：'))
     console.log()
 
     for (let i = 0; i < warnings.length; i++) {

build/utils.js

@@ -18,7 +18,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-let devModules = ['index','appoint','sale','systemConfig']
+let devModules = ['index','appoint','sale','systemConfig','RMS']
 // let devModules = ['index','SporadicManage']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

@@ -56,30 +56,28 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://192.168.1.102:8080",
+    target: "http://192.168.1.100:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://192.168.1.102:8080",
+    target: "http://192.168.1.100:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
     }
   },
   '/icore.icp.web/pass/logout': {
-    target: 'http://172.16.33.161:9001/logout',
+    target: 'http://172.16.33.166:9001/logout',
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/logout': '/'
     }
   },
 }
-
 let dist = '../dist';
-
 if (pathSrc.indexOf('node_modules') > -1) {
     dist = '../../../dist';
     let proxyTableGet = require('../../../cors.js').proxyTable;

src/assets/css/el/el-form.css

@@ -1,4 +1,4 @@
-.el-form-item {
+/* .el-form-item {
     margin-bottom: 13px;
 }
 
@@ -30,4 +30,4 @@
 .el-form--inline .el-form-item {
     margin-right: 5px;
 }
-
+ */

src/assets/css/el/index.css

@@ -1,4 +1,4 @@
-@import './el-breadcrumb.css';
+/* @import './el-breadcrumb.css';
 @import './el-button.css';
 @import './el-checkbox.css';
 @import './el-date.css';
@@ -21,4 +21,4 @@
 
 .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__separator {
     color: #fff;
-}
+} */

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

@@ -301,7 +301,7 @@ export default {
 
         this.setDataRequestQuery(q);
       }
-    }
+    },
   },
   // 注册组件
   components: {

src/components/main.vue

@@ -1235,10 +1235,11 @@ export default {
      *打开主页
      */
     backMain() {
-      window.open(
-        window.location.protocol + "//portal.steerinfo.com",
-        "_blank"
-      );
+      this.$message.success('跳转主页');
+      // window.open(
+      //   window.location.protocol + "//portal.steerinfo.com",
+      //   "_blank"
+      // );
     },
     /**
      * 主题

src/utils/sharedJsFile.js

@@ -13,7 +13,7 @@
  }
  export function isNumber(value) {
    // 验证是否为数字
-   var patrn = /^(-)?\d+(\.\d+)?$/;
+   var patrn = /^(-?\d+)(\.\d+)?$/;
    if (patrn.exec(value) == null || value === '') {
      return false;
    } else {

src/views/RMS/components/addCapacity.vue

@@ -6,7 +6,7 @@
      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
-      <!-- <div class="inputBox">
+    <div class="inputBox">
     <span class="text">所属承运商</span>
       <el-autocomplete
         class="input"
@@ -17,7 +17,7 @@
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
-    </div> -->
+    </div>
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -40,53 +40,63 @@ export default {
       restaurants: [],
       accessToken:null,
       userCode:null,
-      carrierUserId:null
+      carrierUserId:null,
+      carrierId:null
     };
   },
   created(){
       this.carrierUserId = getCookie("userId");
       console.log(this.carrierUserId ,'carrierUserId')
+      
   },
   mounted() {
-    
-  },
+   this.axios.post(
+       "api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+        console.log(res.data.data)
+        this.state = res.data.data.carrierName
+        this.carrierIds = res.data.data.carrierId
+        }      
+  })},
   methods: {
-    //  onInput() {
-    //   this.axios.post(
-    //     "/api/v1/rms/getCarrierName?state="+this.state,
-    //   )
-    //   .then((res) => {
-    //     if(res.data.code == "200"){
-    //       res.data.data.forEach(element => {
-    //         this.restaurants.push({
-    //           value:element.carrierName,
-    //           carrierIds:element.carrierId
-    //         })
-    //       });
-    //     }
+     onInput() {
+      this.axios.post(
+        "/api/v1/rms/getCarrierName?state="+this.state,
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+          res.data.data.forEach(element => {
+            this.restaurants.push({
+              value:element.carrierName,
+              carrierIds:element.carrierId
+            })
+          });
+        }
         
-    //   });
-    // },
-    // querySearch(queryString, cb) {
-    //   var restaurants = this.restaurants;
-    //   var results = queryString
-    //     ? restaurants.filter(this.createFilter(queryString))
-    //     : restaurants;
-    //   // 调用 callback 返回建议列表的数据
-    //   cb(results);
-    // },
-    // createFilter(queryString) {
-    //   return (restaurant) => {
-    //     return (
-    //       restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-    //       0
-    //     );
-    //   };
-    // },
-    // handleSelect(item) {
-    //   this.carrierIds = item.carrierIds;
-    //   console.log(item);
-    // },
+      });
+    },
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    handleSelect(item) {
+      this.carrierIds = item.carrierIds;
+      console.log(item);
+    },
     deleteUser(userId){
         this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
            this.$message.error("添加失败,车牌可能重复");
@@ -119,9 +129,8 @@ export default {
         capacityOwneris: this.form1.capacityOwneris,
         capacityVip: this.form1.capacityVip,
         capacityBlacklist: this.form1.capacityBlacklist,
-        // carrierId:this.form1.carrierId,
-        state: this.state,
-        carrierUserId:this.carrierUserId
+        carrierId:this.carrierIds,
+        state: this.state
       };
       if (
         RmsCapacity.capacityNumber == null ||
@@ -169,22 +178,6 @@ export default {
           this.$message.error(res.message);
         }
       });
-      //   this.axios
-      //     .post("/api/v1/rms/insertCapacity", RmsCapacity)
-      //     .then((res) => {
-      //       console.log("res.data.code", res.data.code);
-      //       if (res.data.code == 200) {
-      //         this.$message({
-      //           type: "success",
-      //           message: "新增成功!",
-      //         });
-      //         // this.$refs.table.refreshData();
-      //         this.$router.go(-1);
-      //       } else {
-      //         this.$message.error("新增失败,可能存在重复！");
-      //       }
-      //       // this.$refs['table'].resetField();
-      //     });
     },
     // 取消
     cancel() {

src/views/RMS/components/addCarrier.vue

@@ -235,13 +235,15 @@ export default {
         this.$message.error("承运商名称不能为空");
       } else if (!this.form1.carrierType) {
         this.$message.error("承运商类型不能为空");
-      // }else if (!this.imageUrl1) {
+      }
+      // else if (!this.imageUrl1) {
       //   this.$message.error("请上传运输证");
       // } else if (!this.imageUrl2) {
       //   this.$message.error("请上传经营许可证");
       // } else if (!this.imageUrl3) {
       //   this.$message.error("请上传营业执照");
-      }else {
+      // }
+      else {
         status = true;
       }
       if (this.form1.registerDate) {

src/views/RMS/components/addMaterial.vue

@@ -69,7 +69,6 @@ export default {
     },
      makeSure() {
       let RmsMaterial = {
-        materialCode:this.form1.materialCode,
         materialName:this.form1.materialName,
         materialSpecification:this.form1.materialSpecification,
         materialModel:this.form1.materialModel,
@@ -78,7 +77,6 @@ export default {
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
       };
       if(
-        RmsMaterial.materialCode==null ||
         RmsMaterial.materialName==null ||
         RmsMaterial.materialSpecification==null ||
         RmsMaterial.materialModel==null ||
@@ -101,7 +99,7 @@ export default {
             // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
-            this.$message.error("新增失败,可能存在重复！");
+            this.$message.error("新增失败");
           }
           this.$refs['table'].resetField();
         });

src/views/RMS/components/editCapacity.vue

@@ -10,7 +10,20 @@
           <dil-form :formId="310" v-model="form1"></dil-form>
       </div>
     </div>
+    <div class="inputBox">
+    <span class="text">所属承运商</span>
+      <el-autocomplete
+        class="input"
+        v-model="state"
+        @input="onInput"
+        :fetch-suggestions="querySearch"
+        placeholder="边输入边查询"
+        :trigger-on-focus="false"
+        @select="handleSelect"
+      ></el-autocomplete>
+    </div>
 </div>
+
         <!-- <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
 <div class="disableBox">
@@ -50,28 +63,85 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
-      drawer: false,
+      state: "",
+      userId:null,
+      restaurants: [],
+      accessToken:null,
+      userCode:null,
+      carrierUserId:null,
+      carrierId:null,
+      carrierIds:null,
       direction: 'rtl',
       inputText:"",
       form1: {},
+      carrierUserId:null,
       carrierName:"",
-    options:{
+      options:{
         requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
         selectionType:"radio",
         mapList:[]
       }
     };
   },
-  mounted() {
-      console.log(this.$route)
-    this.information();
-  },
+  created(){
+      this.carrierUserId = getCookie("userId");
+      console.log(this.carrierUserId ,'carrierUserId')
+      
+  },
+  mounted() {
+   this.information();
+   this.axios.post(
+       "api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+        console.log(res.data.data)
+        this.state = res.data.data.carrierName
+        this.carrierIds = res.data.data.carrierId
+        }      
+  })},
   methods: {
+      onInput() {
+      this.axios.post(
+        "/api/v1/rms/getCarrierName?state="+this.state,
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+          res.data.data.forEach(element => {
+            this.restaurants.push({
+              value:element.carrierName,
+              carrierIds:element.carrierId
+            })
+          });
+        }
+        
+      });
+    },
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    handleSelect(item) {
+      this.carrierIds = item.carrierIds;
+      console.log(item);
+    },
     currentRadioChange(selection){
       this.mapList=selection,
       console.log(this.mapList)
@@ -82,7 +152,7 @@ export default {
     },
     information() {
       //编辑 
-console.log(this.$route.params)            
+    console.log(this.$route.params)            
      
       this.axios
         .post(
@@ -99,13 +169,13 @@ console.log(this.$route.params)
             console.log(this.form1);
             console.log( this.$route.params.capacityId);
           }); 
- this.axios
+        this.axios
         .post(
           "/api/v1/rms/getCarrierNameById/" +
           this.$route.params.capacityId
         )
         .then((res) => {
-          this.carrierName=res.data.data.carrierName
+          this.state=res.data.data.carrierName
           console.log("carrierName",this.carrierName);
         }); 
         });
@@ -125,7 +195,7 @@ console.log(this.$route.params)
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-       //  carrierId:this.mapList.carrierId,
+          carrierId:this.carrierIds,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -7,35 +7,48 @@
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
-      >
+        >
         <el-form-item label="发货单位">
-          <el-input v-model="supplierName" placeholder="必填" disabled>
-          </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+          @input="oninputSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
         </el-form-item>
         </el-form>
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
-      >
+        >
         <el-form-item label="收货单位">
-          <el-input v-model="receiveName" placeholder="必填" disabled>
-          </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+          @input="oninputConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</div>
+        </template>
+        </el-autocomplete>
         </el-form-item>
         </el-form>
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
       >
         <el-form-item label="流向">
@@ -53,7 +66,6 @@
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
       >
         <el-form-item label="选择路线">
@@ -67,21 +79,20 @@
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
       >
         <el-form-item label="选择承运商">
          <el-autocomplete
           class="inline-input"
-          v-model="state2"
-          :fetch-suggestions="querySearch"
+          v-model="stateCarrier"
+          :fetch-suggestions="querySearchCarrier"
           placeholder="请输入承运商名称"
           :trigger-on-focus="false"
-          @select="handleSelect"
-          @input="oninput"
+          @select="handleSelectCarrier"
+          @input="oninputCarrier"
         >
         <template slot-scope="{ item }">
-          <div class="name">{{ item.value }}</div>
+          <div class="name">{{ item.carrierName }}</div>
         </template>
         </el-autocomplete>
         </el-form-item>
@@ -89,7 +100,6 @@
         <el-form
         :inline="true"
         class="demo-form-inline"
-        :label-position="left"
         label-width="80px"
       >
         <el-form-item label="选择物资">      
@@ -122,7 +132,6 @@
       </el-tooltip>
     </div>
     </div>
-
     <!-- 物资表格 -->
     <div class="truckListTable">
     <div class="selectionTable">
@@ -236,12 +245,6 @@
           @radio-change="currentRadioChange2"
         ></dilTable>
       </div>
-      <div v-show="a == 3">
-        <dilTable
-          v-bind.sync="third"
-          @selection-change="currentRadioChange3"
-        ></dilTable>
-      </div>
       <div v-show="a == 5">
         <dilTable
           v-bind.sync="line"
@@ -258,15 +261,19 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-import { Checkbox } from 'element-ui';
-
 export default {
   components: { PageTitle },
   data() {
     return {
+      options: [],
+      value: '',
       receiveName:'',
-      state2:null,
-      restaurants: [],
+      stateCarrier:null,
+      stateSupplier:null,
+      stateConsignee:null,
+      restaurantsConsignee:null,
+      restaurantsSupplier:null,
+      restaurantsCarrier: [],
       orderTypeList:[
         {
           value:12,
@@ -276,6 +283,7 @@ export default {
           label:'出厂'
         }
       ],
+      likeCarrierLike:'',
       orderType:12,
       // 线路名称
       lineName: "",
@@ -346,12 +354,6 @@ export default {
             "/api/v1/uc/selectAllMaterialName?apiId=395",
            selectionType: "select",
       },
-      secend: {
-        requestUrl:
-          "/api/v1/uc/querySupplierByLike?apiId=247",
-        selectionType: "radio",
-        mapList2: [],
-      },
       receiveOptions:{
         requestUrl:
           "/api/v1/uc/queryConsigneeByLike?apiId=396",
@@ -392,40 +394,85 @@ export default {
       this.selectionList1 = []
       this.table = true
     },
-    handleSelect(item){
-      this.carrierId = item.carrierId
-      item.carrierName = this.state2
+    //收货单位弹出层
+    handleSelectConsignee(item){
+      console.log(this.consigneeId)
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+      console.log(this.consigneeId)
+      console.log('这是选中的收货单位')
     },
-    oninput(){
-      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
         if(res.data.code == "200"){
           console.log(res)
-          this.restaurants = res.data.data
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+     //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
         }
-      })
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+    //承运商弹出层
+    handleSelectCarrier(item){    
+      this.carrierId = item.carrierId
+      item.carrierName = this.stateCarrier
     },
-    //搜索
-    querySearch(queryString, cb) {
-        var restaurants = this.restaurants;
-        console.log(this.restaurants,"this.restaurants");
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-        // 调用 callback 返回建议列表的数据
-        console.log(results,"results");
-        cb(results);
+    //以下是承运商边输边查搜索
+    querySearchCarrier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
       },
-      createFilter(queryString) {
-        return (restaurants) => {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
         };
       },
+    //以上是承运商边输边查搜索
     //删除行
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1)
-      debugger  
+      console.log(this.selectionList1) 
       this.selectionList1.forEach((e) => {
         var addmap = {
           materialCode: e.materialCode,
@@ -433,7 +480,7 @@ export default {
           Specification: e.materialSpecification+e.materialModel,
           orderMaterialWeight: null,        
           materialId: e.materialId,
-          materialPriority:e.materialPriority,
+          materialPriority:null,
         };
           this.tableData.push(addmap);
       });     
@@ -513,20 +560,48 @@ export default {
       this.carriermapList = [];
       this.carriermapList = selection;
     },
+    jgao(){
+      this.$alert('有数据未填写')
+      return
+    },
     // 确认
     makeSure() {
-      console.log(this.tableData)
+        console.log(this.supplierId,"this.supplierId")
+        console.log(this.consigneeId,"this.consigneeId")
+        console.log(this.carrierId,"this.carrierId")
+        console.log(this.lineId,"this.lineId")
+        console.log(this.tableData)
+        if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
+          this.$alert('存在空值')
+          return
+        }else if(this.tableData.length == 0){
+          this.$alert('请点击浏览勾选物资')
+          return
+        }
+        var i = 0;
+        var j = 0;
+        this.tableData.forEach((e) => {
+          if(e.materialPriority == null){
+            i++
+          }else if(e.orderMaterialWeight == null){            
+            j++
+          }            
+        })
+        if(i != 0){
+           this.$alert('装卸货优先级未填写')
+           return
+        }else if(j != 0){
+           this.$alert('物资重量未填写')
+           return
+        }
         let amsOrder = {
           supplierId:this.supplierId,
-          unloadPointId:this.unloadPointId,
           lineId:this.lineId,
           orderType:this.orderType,
           carrierId: this.carrierId,
-          receiveId: this.receiveId,
+          receiveId: this.consigneeId,
           mapList: this.tableData,
-        };
-        console.log(amsOrder);
-      
+        };   
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.$router.go(-1)
@@ -580,7 +655,7 @@ export default {
   }
 }
 .button-box {
-  margin-left: 25px !important;
+  margin-left: 45% ;
 }
 }
 </style>

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

@@ -72,7 +72,7 @@
       </el-tabs>
     </div>
 
-    <el-dialog
+    <!-- <el-dialog
       title="请选择车辆"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
@@ -83,16 +83,7 @@
       modal
       lock-scroll
     >
-      <el-input placeholder="请输入内容" v-model="capacityNumber" disabled>
-      </el-input>
-      <el-button type="primary" @click="onDrawer">浏 览</el-button>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="determine">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <el-drawer
+     <el-drawer
       title="请选择车辆信息"
       :visible.sync="drawer"
       :direction="direction"
@@ -116,6 +107,28 @@
         ></dilTable>
       </div>
     </el-drawer>
+    </el-dialog> -->
+    <el-drawer
+      title="请选择车辆信息"
+      :visible.sync="drawer"
+      :direction="direction"
+      :destroy-on-close="true"
+      :before-close="handleClose"
+    >
+      <div class="drawer_top">
+        <el-input placeholder="请输入内容" v-model="inputText" clearable>
+        </el-input>
+        <el-button type="primary" class="btn" @click="inputClick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_bottom">
+        <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -181,7 +194,7 @@ export default {
       capacityId: null,
       //是否关闭模态框
       drawer: false,
-      //模态框从右往左打开
+      //模态框从左往右打开
       direction: "rtl",
       //多选的选中的订单id
       selectionList: [],
@@ -194,11 +207,15 @@ export default {
       console.log(this.carrierUserId)
       this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
       this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
-      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
+      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId ,
       this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
   },
   methods: {
-       onclick(){
+    handleClose(done){
+        this.determine();
+        done();
+    },
+    onclick(){
       if(this.input != ''){
         this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
       }else{
@@ -226,12 +243,10 @@ export default {
                   message: "下发成功",
                   type: "success",
                 });
-                this.option.requestUrl =
-                  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&i=" +
-                  new Date();
-                  this.first.requestUrl =
-                  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&i=" +
-                  new Date();
+                this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
+                this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
+                this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
+                this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
               }
             });
           }
@@ -240,8 +255,6 @@ export default {
     },
     //对话框点击确定，执行增加车牌号
     determine() {
-      console.log(this.selectOrderId)
-      console.log(this.capacityId)
       this.axios
         .post("/api/v1/oms/updateOmstruckOrder", {
           orderId: this.selectOrderId,
@@ -261,9 +274,10 @@ export default {
               });
             }
             this.dialogVisible = false;
-            this.option.requestUrl =
-              "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&i=" +
-              new Date();
+            this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
+            this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
+            this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
+            this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
           }
         });
     },
@@ -284,19 +298,19 @@ export default {
       this.capacityNumber = row.capacityNumber;
     },
     //打开模态窗口
-    onDrawer() {
-      this.drawer = true;
-    },
+    // onDrawer() {
+    //   this.drawer = true;
+    // },
     //弹出消息窗口
     addTruck(row, index) {
       this.index = index;
       if (index == 1) {
         this.selectOrderId = row.orderId;
-        this.dialogVisible = true;
+        this.drawer = true;
       } else if (index == 2) {
         this.selectOrderId = row.orderId;
         this.capacityNumber = row.capacityNumber;
-        this.dialogVisible = true;
+        this.drawer = true;
       }
     },
     // 查看物资详情

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

@@ -1,102 +1,53 @@
 <template>
-  <!-- 添加销售订单排车 -->
-  <div class="addSalePlan">
+  <div class="addSaleOrderSend">
     <page-title>新增销售订单派车</page-title>
-        <div>
-            <el-tabs v-model="activeName" >
-                <dilTable ref="tab" v-bind.sync="option">
-                </dilTable>
-            </el-tabs>
-        </div>
-        
-        <el-form :inline="true" style="margin-top: 2rem;">
-            <el-form-item>
-                <label class="el-form-item__label" style="width: auto;margin-left: 2rem;">物资名称:</label>
-                <el-select v-model="materials" placeholder="请选择">
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-                 </el-select>
-            </el-form-item>
-            <el-form-item>
-                <div class="lineId">
-                <div class="materialId">
-                    <label class="el-form-item__label" style="width: auto;margin-left: 2rem;">承运商:</label>
-                    <el-input class="input" v-model="carrierName" disabled> </el-input>
-                    <el-button type="primary" class="btn" @click="table2 = true">浏览</el-button>
-                </div>
-                </div>
-            </el-form-item>
-            <el-form-item>
-                <div class="lineId">
-                <div class="materialId">
-                    <label class="el-form-item__label" style="width: auto;margin-left: 2rem;">选择路线:</label>
-                    <el-input class="input" v-model="lineName" disabled> </el-input>
-                    <el-button type="primary" class="btn" @click="table1 = true">浏览</el-button>
-                </div>
-                </div>
-            </el-form-item>
-        </el-form>
-
-        <!-- 承运商模态框 -->
-        <el-drawer
-        title="选择承运商"
-        :visible.sync="table2"
-        direction="rtl"
-        size="35%"
-        :show-close="false"
-        >
-        <el-input placeholder="请输入内容" v-model="index"  
-        style="margin-top: 10px; margin-left: 20px;width:160px" clearable> </el-input
-        ><el-button type="primary" class="btn" @click="onclick" style="margin-left: 4px;">
-            <i class="el-icon-search"></i>查询
-        </el-button>
-        <div class="tablecls">
-            <!-- 查询所有的承运商 -->
-            <dilTable v-bind.sync="carrier" @radio-change="currentRadioChange2">
-            </dilTable>
-        </div>
-        </el-drawer>
-
-        <!-- 选择路线模态窗口 -->
-        <el-drawer
-        title="选择路线"
-        :visible.sync="table1"
-        direction="rtl"
-        size="50%"
-        :show-close="false"
-        >
-        <el-input placeholder="请输入内容" v-model="input"  
-        style="margin-top: 10px; margin-left: 20px;width:160px" clearable> </el-input
-        ><el-button type="primary" class="btn" @click="onclick1" style="margin-left: 4px;">
-            <i class="el-icon-search"></i>查询
-        </el-button>
-        <div class="tablecls">
-            <!-- 查询所有的路线 -->
-            <dilTable
-            v-bind.sync="line" @radio-change="currentRadioChange5"
-            ></dilTable>
-        </div>
-        </el-drawer>
-
-        <!-- 选择新增条数及确认按钮 -->
-        <div class="lineId">
-            <div class="materialId">
-                <label class="el-form-item__label" style="width: auto;margin-left: 2rem;margin-top: 0.3rem;">派车数:</label>
-                <el-input class="input1" v-model="carCount"> </el-input>
-                <el-button type="primary" class="btn" @click="makeSure1">确认分派</el-button>
-            </div>
-        </div>
+    <!-- 销售订单表的数据 -->
+    <div class="saleOrder">
+      <dilTable
+        v-bind.sync="option"
+        @radio-change="currentRadioChange"
+      ></dilTable>
+    </div>
+    <!-- 表单选择车辆和线路 -->
+    <div class="from">
+      <div class="line">
+        <span class="text">线路</span>
+        <el-input
+          v-model="lineName"
+          placeholder="请选择线路"
+          disabled
+        ></el-input>
+        <el-button type="primary" @click="onClick(1)">浏览</el-button>
+      </div>
+      <div class="vehicle">
+        <span class="text">车辆</span>
+        <el-button type="primary" @click="onClick(2)">浏览</el-button>
+        <span class="span"></span>
+      </div>
+    </div>
 
     <!-- 派车表格 -->
     <div class="selectionTable from">
-      <el-table :data="selectionList" border style="width: 100%" highlight-current-row>
-        <el-table-column v-for="(item, i) in tableTop" :key="i" :prop="item.prop" :label="item.label" :width="item.width" align="center"
-          show-overflow-tooltip>
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
           <template slot="scope" v-if="item.label !== '重量'">
             <span>{{ item.label }}</span>
           </template>
-          <template slot="scope" v-if="item.label !== '车牌号'">
-            <span>{{ item.label }}</span>
-          </template>
           <template slot="scope" v-if="item.label !== '收货地址'">
             <span>{{ item.label }}</span>
           </template>
@@ -112,32 +63,34 @@
           <!-- 插入输入框 -->
           <template slot-scope="scope">
             <template v-if="item.slot">
-              <!-- 车牌号 -->
-              <template v-if="item.prop == 'capacityNumber'">
-                <el-input
-                  class="textinput1"
-                  v-model.number="scope.row.capacityNumber"
-                ></el-input>
-              </template>
               <!-- 物资重量 -->
               <template v-if="item.prop == 'orderPlanWeight'">
                 <el-input
                   class="textinput"
+                  @input="onInput"
+                  placeholder="请输入内容(必填)"
                   v-model.number="scope.row.orderPlanWeight"
                 ></el-input>
               </template>
-              
+
               <!-- 收货地址id -->
-              <template style="width: 400px" v-if="item.prop == 'saleShipperAddressName'">
-                <el-input style="width: 200px" v-model="scope.row.saleShipperAddressName" disabled>
+              <template v-if="item.prop == 'saleShipperAddressName'" >
+                <el-input
+                  style="width: 200px"
+                  v-model="scope.row.saleShipperAddressName"
+                  disabled
+                >
                 </el-input>
-                <el-button type="primary" @click="ondrawer(scope.row,scope.$index)"
+                <el-button
+                  type="primary"
+                  placeholder="请输入内容(必填)"
+                  @click="select(scope.$index,3)"
                   >浏览</el-button
                 >
               </template>
               <!-- 收货日期 -->
               <template v-if="item.prop == 'saleDateOfReceipt'">
-                <el-date-picker
+                 <el-date-picker
                   class="textinput3"
                   type="date"
                   v-model.number="scope.row.saleDateOfReceipt"
@@ -147,6 +100,7 @@
               <template v-if="item.prop == 'saleOrderConsignee'">
                 <el-input
                   class="textinput4"
+                  placeholder="请输入内容(非必填)"
                   v-model.number="scope.row.saleOrderConsignee"
                 ></el-input>
               </template>
@@ -154,7 +108,9 @@
               <template v-if="item.prop == 'saleOrderConsigneeTel'">
                 <el-input
                   class="textinput5"
+                  placeholder="请输入内容(非必填)"
                   v-model.number="scope.row.saleOrderConsigneeTel"
+                  @input="onInput"
                 ></el-input>
               </template>
             </template>
@@ -167,7 +123,14 @@
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
-              @click.native.prevent="deleteRow(scope.$index, selectionList)"
+              @click="copyRow(scope.$index,scope.row)"
+              type="text"
+              size="big"
+            >
+              复制
+            </el-button>
+            <el-button
+              @click="deleteRow(scope.$index)"
               type="text"
               icon="el-icon-close"
               size="big"
@@ -176,106 +139,206 @@
         </el-table-column>
       </el-table>
     </div>
-
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="true"
-      :show-close="true"
-      :wrapperClosable="true"
+    <!-- 线路模态框 -->
+    <el-drawer 
+      :visible.sync="drawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
       modal
-      size="30%"
+      close-on-press-escape
+    
     >
       <el-input
         placeholder="请输入内容"
-        v-model="textInput"
-        style="margin-top: 10px; margin-left: 20px;width: 200px"
+        v-model="lineText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
         clearable
       >
       </el-input>
       <el-button
         type="primary"
         class="btn"
-        @click="onclick1()"
-        style="margin-bottom: 15px"
+        @click="selectClick"
+        style="margin-left: 5px"
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-      <dilTable
-        v-bind.sync="frist"
-        @radio-change="currentRadioChange1"
-      ></dilTable>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的路线 -->
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <!-- 车辆模态框 -->
+    <el-drawer 
+      :visible.sync="truckDrawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
+      modal
+      close-on-press-escape
+    
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="truck"
+          @selection-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <!-- 收货地址的模态框 -->
+    <el-drawer 
+      :visible.sync="addressDrawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
+      modal
+      close-on-press-escape
+    
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="addressText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectAddressClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="addAddressClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的收货地址 -->
+        <dilTable
+          v-bind.sync="Address"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
     </el-drawer>
 
-    <div class="button-box">
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
   </div>
 </template>
+
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { getCookie } from "@/utils/util.js";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
     return {
-      materials: "",
-      //线路
-      table1: false,
-      lineName:"",
+      //线路名称
+      lineName:null,
+      lineId:null,
+      //线路表格单选缓存数据的
+      cacheLine:[],
+      //已经选择车辆物资信息
+      selectionList:[],
+      //销售订单物资信息
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        // 控制显示当选列
+        selectionType: "radio",
+        isPagination: false,
+      },
+      //当前选中的物资id
+      materialId: null,
+      //当前选中的物资名称
+      materialName: null,
+      //选中的线路名称
+      lineName: null,
+      //选中的线路id
+      lineId: null,
+      //是否打开选择线路的模态框
+      drawer:false,
+      //是否打开选择车辆的模态框
+      truckDrawer:false,
+      //是否打开收货地址的模态框
+      addressDrawer:false,
+      //线路的表格
       line: {
         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
         selectionType: "radio",
       },
-      //承运商
-      table2: false,
-      carrierName: "",
-      carrier: {
-        requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
-        selectionType: "radio",
+      //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "select",
       },
-      //新增车数
-      carCount: 1,
-
-
-      textInput: "",
-      input: "",
-      //销售订单物资信息
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId,
-      },
-      table: false,
-      //表格数据lists
-      selectionList: [],
-      //表格新增lists
-      selectionList1: [],
-      drawer: false,
-      direction: "rtl",
-      form1: {},
-      value: false,
-      frist: {
+      //收货地址的表格
+      Address: {
         requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
         selectionType: "radio",
-        mapList: [],
       },
-      options: [
-        {
-          values: "yes",
-          label: "是",
-        },
-        {
-          values: "no",
-          label: "否",
-        },
-      ],
-      values: "yes",
+      addressText:null,
+      //线路表格的框计算输入的值
+      lineText:null,
       tableTop: [
         {
           prop: "capacityNumber",
           label: "车牌号",
-          slot: true,
+          width: "100",
         },
         {
           prop: "materialName",
@@ -285,16 +348,17 @@ export default {
         {
           prop: "carrierName",
           label: "承运商",
-          width: "120",
+          width: "220",
         },
         {
           prop: "lineName",
           label: "运输线路",
-          width: "140",
+          width: "220",
         },
         {
           prop: "orderPlanWeight",
           label: "重量",
+          width: "140",
           slot: true,
         },
         {
@@ -305,238 +369,281 @@ export default {
         },
         {
           prop: "saleDateOfReceipt",
-          label: "收货日期",
-          width: "110",
+          label: "发货日期",
+          width: "270",
           slot: true,
         },
         {
           prop: "saleOrderConsignee",
           label: "收货客户",
+          width: "150",
           slot: true,
         },
         {
           prop: "saleOrderConsigneeTel",
           label: "收货客户电话号码",
           slot: true,
+          width: "150",
         },
       ],
-      row: {},
+      truckText:null,
+      //当前多选选中的车辆
+      selectTruck:[],
+      //销售订单与物资表主键
+      saleMaterialId:null,
+      //记录点击的市哪一个收货地址的浏览
+      addressIndex:null,
+      //缓存当前选中的收货地址
+      addressMap:{},
     };
   },
-  watch: {
-    
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+    this.option.requestUrl = "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId;
   },
   methods: {
-    currentRadioChange2(selectoin){
-        console.log("selectoin",selectoin)
-      this.carrierName = selectoin.carrierName;
+    onInput(val){
+      if(!isNumber(val)){
+        this.$message.warning('重量/电话号码请输入数字')
+      }
+    },
+    //点击确定按钮的事件
+    makeSure(){
+      let state = false;
+      this.selectionList.forEach((e)=>{
+        console.log(e.orderPlanWeight,"orderPlanWeight")
+        if(!isNumber(e.orderPlanWeight)){
+          this.$message.error('重量请输入数字')
+        }else if(e.saleOrderConsigneeTel){
+          if(!isNumber(e.saleOrderConsigneeTel)){
+            this.$message.error('电话号码请输入数字')
+          }else{
+            e.saleOrderConsigneeTel = e.saleOrderConsigneeTel+"",
+            state = true
+          }
+        }else {
+          e.saleOrderConsigneeTel = null,
+          state = true
+        }
+        if(e.saleDateOfReceipt){
+          e.saleDateOfReceipt = sjTime(e.saleDateOfReceipt)
+        }
+        console.log(typeof e.saleDateOfReceipt)
+      })
+      
+      console.log(this.selectionList)
+      if(state){
+        this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
+          saleOrderId:this.$route.params.saleOrderId,
+          mapList:this.selectionList,
+        }).then((res)=>{
+          if(res.data.code == '200'){
+            this.$message.success('派车成功')
+            this.cancel();
+          }
+        })
+      }else{
+        this.$message.warning('重量/电话号码请输入数字')
+      }
     },
-    currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
-    //   this.lineId = selection.lineId;
+    //点击取消按钮的事件
+    cancel(){
+      this.$router.push('/saleOrder')
     },
-    // 确认新增一列或多列派车行
-    // makeSure1() {
-    //     console.log("this.option[0].saleMaterialId",this.option)
-    //   for(var i=0;i<this.carCount;i++){
-    //       var addmap = {
-    //           capacityNumber : null,
-    //           materialName : this.materials,
-    //           carrierName : this.carrierName,
-    //           lineName : this.lineName,
-    //           orderPlanWeight : null,
-    //           saleShipperAddressId: null,
-    //           saleShipperAddressName:null,
-    //           saleDateOfReceipt: null,
-    //           saleOrderConsignee: null,
-    //           saleOrderConsigneeTel: null,
-    //       }
-    //       this.selectionList.push(addmap);
-    //   }
-    // },
-    //删除派车列
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
     },
-    //点击浏览事件
-    ondrawer(row,index) {
-      this.row = row;
-      this.row.index = index;
-      this.drawer = true;
+    //复制的方法
+    copyRow(index,row){
+      let arr = [];
+      for(var i = 0 ;i<this.selectionList.length; i++){
+        if(i == index){
+          arr.push(this.selectionList[i]);
+          arr.push({
+            capacityId:row.capacityId,
+            capacityNumber:row.capacityNumber,
+            carrierName:row.carrierName,
+            lineId:row.lineId,
+            lineName:row.lineName,
+            materialId:row.materialId,
+            materialName:row.materialName,
+            orderPlanWeight:row.orderPlanWeight,
+            saleDateOfReceipt:row.saleDateOfReceipt,
+            saleMaterialId:row.saleMaterialId,
+            saleOrderConsignee:row.saleOrderConsignee,
+            saleOrderConsigneeTel:row.saleOrderConsigneeTel,
+            saleShipperAddressName:row.saleShipperAddressName,
+            saleShippingAddressId:row.saleShippingAddressId,
+          }
+          )
+        }else{
+          arr.push(this.selectionList[i]);
+        }
+      }
+      this.selectionList = [];
+      this.selectionList = arr;
     },
-    //监听模态框点击事件
-    currentRadioChange1(radioList) {
-      this.selectionList[this.row.index].saleShipperAddressId = radioList.addressId;
-      this.selectionList[this.row.index].saleShipperAddressName = radioList.address;
+    //收货地址模态窗口的框计算
+    selectAddressClick(){
+      this.Address.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
     },
-    //收货地址模态框查询
-    onclick1() {
-      this.option.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" + this.textInput;
+    //收货地址模态窗口的点击事件
+    addAddressClick(){
+      this.selectionList[this.addressIndex].saleShipperAddressName = this.addressMap.address
+      this.selectionList[this.addressIndex].saleShippingAddressId = this.addressMap.addressId
+      this.addressDrawer = false;
+      let arr = this.selectionList;
+      this.selectionList = [];
+      arr.forEach((e)=>{
+        this.selectionList.push({
+          //销售订单与物资表主键
+          capacityId:e.capacityId,
+          capacityNumber:e.capacityNumber,
+          carrierName:e.carrierName,
+          lineId:e.lineId,
+          lineName:e.lineName,
+          materialId:e.materialId,
+          materialName:e.materialName,
+          orderPlanWeight:e.orderPlanWeight,
+          saleDateOfReceipt:e.saleDateOfReceipt,
+          saleMaterialId:e.saleMaterialId,
+          saleOrderConsignee:e.saleOrderConsignee,
+          saleOrderConsigneeTel:e.saleOrderConsigneeTel,
+          saleShipperAddressName:e.saleShipperAddressName,
+          saleShippingAddressId:e.saleShippingAddressId,
+        })
+      })
     },
-    //物资模态框查询
-    // 框计算
-    onclick() {
-      this.option.requestUrl =
-      "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId;
+    //收货地址点击浏览的事件
+    select(index){
+      this.addressDrawer = true;
+      this.addressIndex = index ;
     },
-    open() {
-      if (this.selectionList1.length != 0) {
-        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+    //收货地址模态框单选选中的事件
+    currentRadioChange2(val){
+      this.addressMap = {};
+      this.addressMap = val;
+    },
+    //车辆模态框的确定事件
+    AddTruckClick(){
+      console.log(this.selectTruck)
+      this.selectTruck.forEach(e => {
+        // console.log(e)
+        this.selectionList.push({
+          //销售订单与物资表主键
+          saleMaterialId:this.saleMaterialId,
+          capacityId:e.capacityId,
+          capacityNumber:e.capacityNumber,
+          carrierName:e.carrierName,
+          materialName:this.materialName,
+          materialId:this.materialId,
+          lineName:this.lineName,
+          lineId:this.lineId,
         })
-          .then(() => {
-            this.selectionList1 = [];
-            this.table = false;
-          })
-          .catch(() => {});
+      });
+      this.truckDrawer = false;
+    },
+    //车辆模态框框计算
+    selectTruckClick(){
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
       } else {
-        this.table = false;
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index="+this.truckText;
       }
     },
-    // 确定
-    makeSure() {
-        //初始化maplist
-      var mapList = [];
-      console.log("this.selectionList",this.selectionList)
-      this.selectionList.forEach((item,i) => {
-        //初始化mapItem
-        var mapItem={
-                //销售订单id
-                saleOrderId : 0,
-                //车序号    
-                truckNo : "",
-                //收货地址id
-                shippingAddressId : 0,
-                //收货日期
-                dateOfReceipt :null,
-                //收货方姓名   
-                orderConsignee :"",
-                //收货方电话 
-                orderConsigneeTel :"",
-                //车序号物资ID
-                saleMaterialId : 0,
-                //物资数量
-                materialNumber : 0,
-            };
-        mapItem.saleOrderId=this.$route.params.saleOrderId;
-        mapItem.truckNo=item.cxh;
-        mapItem.shippingAddressId=item.saleShipperAddressId;
-        mapItem.dateOfReceipt=item.saleDateOfReceipt;
-        mapItem.orderConsignee=item.saleOrderConsignee;
-        mapItem.orderConsigneeTel=item.saleOrderConsigneeTel;
-        mapItem.saleMaterialId=item.saleMaterialId;
-        mapItem.materialNumber=item.orderPlanWeight;
-        mapList.push(mapItem);
-      });
-      // console.log("mapList",mapList);
-        this.axios.post("/api/v1/ams/addTruckNo", mapList).then((res) => {
-          if (res.data.code == "200") {
-            this.$router.go(-1);
-          }
-          this.$message({
-            type: "success",
-            message: "新增车序号成功!",
-          });
-        });    
+    //车辆表格
+    currentRadioChange1(select){
+      this.selectTruck = [];
+      this.selectTruck = select;
     },
-    // 取消
-    cancel() {
-      this.$router.go(-1);
+    //主界面表格单选
+    currentRadioChange(row) {
+      this.materialId = row.materialId;
+      this.materialName = row.materialName;
+      this.saleMaterialId = row.saleMaterialId;
     },
-    //关闭事件
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
+    //线路表格的单选事件
+    currentRadioChange5(row){
+      this.cacheLine = row;
     },
-
-    CloseClick() {},
+    onClick(num) {
+      if (num == 1) {
+        this.drawer = true;
+      }else if(num == 2){
+        if(!this.materialId){
+          this.$message.warning('请选择物资后，再点击')
+        }else if(!this.lineId){
+          this.$message.warning('请选择线路后，再点击')
+        }else{
+          this.truckDrawer = true;
+        }
+      }
+    },
+    //线路表格的框计算
+    selectClick(){
+      this.line.requestUrl = '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con='+this.lineText;
+    },
+    //线路表格的确定事件
+    AddClick(){
+      this.drawer = false;
+      this.lineName = this.cacheLine.lineName +"  "+ this.cacheLine.lineDesk;
+      this.lineId = this.cacheLine.lineId;
+    }
   },
 };
 </script>
-<style lang='scss' scoped>
-.addSalePlan{
-  width: 100%;
-}
-.switch{
-  margin-left: 60rem;
-}
-.lineId {
-  display: flex;
-  justify-content: center;
-  margin-left: 2rem;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
+
+<style lang='scss'>
+.addSaleOrderSend {
+  .from {
+    margin-top: 20px;
+    .line {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-input {
+        width: 350px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+    .vehicle {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+      .el-button {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+      .span {
+        width: 70px;
+      }
+    }
   }
-  .input{
-    width: 250px;
-    margin-right: 20px;
+  .tablecls{
+    margin-top: 20px;
   }
-  .input1{
-    width: 60px;
-    margin-right: 20px;
+  .button_box{
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+    .el-button{
+      width: 100px;
+      margin-left: 20px;
+    }
   }
 }
-.form-box,
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
-.select {
-  margin-left: 2rem;
-}
-.makeSureAdd{
-  width: 100px;
-  margin-left: 3.5rem;
-  margin-top: 0.3rem;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  display: flex;
-}
-.demo-form-inline {
-  margin-left: 2rem;
-}
-.table_form {
-  margin-left: -16rem;
-}
-.textinput {
-  width: 50px;
-}
-.textinput1 {
-  width: 50px;
-  text-align: center;
-  size: small;
-}
-.textinput2 {
-  width: 50px;
-  margin-right: 30px;
-}
-.textinput3 {
-  width: 270px;
-}
-.textinput4 {
-  width: 60px;
-}
-.textinput5 {
-  width: 120px;
-}
 </style>

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

@@ -3,7 +3,6 @@
   <div class="salePlan">
     <div class="main">
       <span class="text">新增车次物资信息</span>
-      <span class="a"></span>
     </div>
     <div>
       <div class="form-box" style="margin-left: 5rem">

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

@@ -98,60 +98,10 @@
 
         </dilTable>
       </el-tab-pane>
-
-
-      <!-- 财务已审批 -->
-      <el-tab-pane label="财务已审批" name="third">
-        <dilTable v-bind.sync="option3" ref="table1">
-          <el-table-column fixed="right" label="操作" width="200">
-            <template slot-scope="scope">
-              <el-button
-                @click="lookclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >查看</el-button
-              >
-              <el-button
-                @click="passclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >修改日志</el-button
-              >
-              <el-button
-                @click="detailclick1(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-        <!-- 物资详情抽屉 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-
-
-        </dilTable>
-      </el-tab-pane>
-      <!-- 销售公司已审批 -->
-       <el-tab-pane label="销售公司已审批" name="four">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
         <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="130">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
                 @click="sendClick(scope.row.saleOrderId)"
@@ -280,7 +230,13 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      console.log(this.input);
+      if(this.activeName == "first"){
+        this.option.requestUrl = "/api/v1/ams/getSaleOrderInfoes?apiId=408&con="+this.input;
+      }else if(this.activeName == "second"){
+        this.option2.requestUrl = "/api/v1/ams/getSaleOrderReportedes?apiId=408&con="+this.input;      
+      }else if(this.activeName == "four"){
+        this.option4.requestUrl = "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&con="+this.input;      
+      }
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
@@ -297,10 +253,7 @@ export default {
     sendClick(saleOrderId){
       this.$router.push("/addSaleOrderSend/" + saleOrderId);
     },
-    // detailedClick(saleOrderId){
-    //   this.$router.push("saleOrderMaterial/" + saleOrderId);
-    // },
-    // -------查看物资详情 (销售公司已审批)
+    // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {

src/views/index/components/login.vue

@@ -223,9 +223,11 @@ export default {
                 });
               }
               this.loginBtnLoading = false;
+              this.$router.go(0)
             })
             .catch(() => {
               this.loginBtnLoading = false;
+              
             });
         } else {
           return false;

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -316,7 +316,7 @@ export default {
 .addInwardRequirement{
 .form-box {
   display: inline-block !important;
-  margin-left: 38%;
+  margin-left: 38% !important;
   .el-input {
     width: 288px;
   }
@@ -328,10 +328,10 @@ export default {
   }
 }
 .box-form {
-  display: inline-block !important ;
+  display: flex ;
   padding-left: 38%;
   .el-form-item {
-    display: flex;
+    display: flex !important;
     padding: 10px;
     .el-form-item__label {
       width: 80px !important;

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",
@@ -83,7 +83,7 @@ export default {
     //   框计算
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1&con="+
+        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&con="+
         this.inputText;
     },
     // 查看物资详情

src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -22,14 +22,14 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1",
+          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2",
       },
     };
   },
   methods: {
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1&con=" + this.inputText;
+        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2&con=" + this.inputText;
     },
   },
 

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=1",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",

src/views/sale/components/transport_excute/qualityResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=1",
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/returnResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=1",
+                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_order/receiveOrder.vue

@@ -1,289 +1,313 @@
 // 接收运单
 <template>
-	<div class="steel_inbound">
-		<div class="sache">
-			<el-input placeholder="请输入内容" v-model="inputText" clearable>
-			</el-input>
-			<el-button type="primary" class="btn" @click="onClick">
-				<i class="el-icon-search"></i>查询
-			</el-button>
-		</div>
-		<template>
-			<div>
-				<el-tabs v-model="activeName">
-					<!-- 已接收 -->
-					<el-tab-pane label="已接收" name="first">
-						<dilTable v-bind.sync="first" ref="table">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 已拒绝 -->
-					<el-tab-pane label="已拒绝" name="second">
-						<dilTable v-bind.sync="second" ref="table1">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick1(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData1" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 未接收 -->
-					<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="third" ref="table2">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick2(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData2" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-				</el-tabs>
-			</div>
-		</template>
-	</div>
-
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onClick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+        <el-tabs v-model="activeName">
+          <!-- 已接收 -->
+          <el-tab-pane label="已接收" name="first">
+            <dilTable v-bind.sync="option1" ref="table">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form label-position="center" inline class="demo-table-expand">
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData" border >
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 已拒绝 -->
+          <el-tab-pane label="已拒绝" name="second">
+            <dilTable v-bind.sync="option2" ref="table1">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick1(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form label-position="center" inline class="demo-table-expand">
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData1" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 未接收 -->
+          <el-tab-pane label="未接收" name="third">
+            <dilTable v-bind.sync="option3" ref="table2">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick2(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form label-position="center" inline class="demo-table-expand">
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData2" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+  </div>
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
-	export default {
-		data() {
-			return {
-				inputText: "",
-				first: {
-					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId'),
-				},
-				second: {
-					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId="+ getCookie('userId'),
-				},
-				third: {
-					// second请求数据的地址
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId'),
-				},
-				activeName: "first",
-				//记录旧的row对象(已接收)
-				oldRow: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
-				oldRowCount: 1,
-				//记录旧的row对象(已拒绝)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
-				oldRowCount1: 1,
-				//记录旧的row对象(未接收)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
-				oldRowCount1: 1,
-				tableHead: [
-					{
-					prop: "materialName",
-					label: "物资名称",
-					width: 150,
-					},
-					{
-					prop: "specificationModel",
-					label: "规格型号",
-					width: 150,
-					},
-					{
-					prop: "materialNumber",
-					label: "物资件数",
-					width: 100,
-					},
-					{
-					prop: "materialWeight",
-					label: "物资重量",
-					width: 100,
-					},
-				],
-				tableData: [],
-				tableData1: [],
-				tableData2: [],
-			}
-		},
-		methods: {
-		 onClick(){
-			  if(this.activeName == "first"){
-              this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-             }else if (this.activeName == "second") {
-			          this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		     } else {
-			   this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		  }
-        
-      
-		 },
-		// -------查看物资详情(已接收)
-		detailclick(row) {
-		// 记录重复点击次数
-		if (this.oldRow === row) {
-			this.oldRowCount += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow != "") {
-			if (this.oldRow != row) {
-			if (this.oldRowCount % 2 === 1) {
-				this.$refs.table.toggleRowExpansion(this.oldRow);
-			} else {
-				this.oldRowCount = 1;
-			}
-			} else {
-			this.oldRow = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData = res.data.data;
-			});
-		},
-		
-		// -------查看物资详情(已拒绝)
-		detailclick1(row) {
-		// 记录重复点击次数
-		if (this.oldRow1 === row) {
-			this.oldRowCount1 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table1.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow1 != "") {
-			if (this.oldRow1 != row) {
-			if (this.oldRowCount1 % 2 === 1) {
-				this.$refs.table1.toggleRowExpansion(this.oldRow1);
-			} else {
-				this.oldRowCount1 = 1;
-			}
-			} else {
-			this.oldRow1 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow1 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData1 = res.data.data;
-			});
-		},
+export default {
+  data() {
+    return {
+      inputText: "",
+      option1: {
+        // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      option2: {
+        // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      option3: {
+        // option3请求数据的地址
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      activeName: "first",
+      //记录旧的row对象(已接收)
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
+      oldRowCount: 1,
+      //记录旧的row对象(已拒绝)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
+      oldRowCount1: 1,
+      //记录旧的row对象(未接收)
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1: [],
+      tableData2: [],
+    };
+  },
+  methods: {
+    onClick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else if (this.activeName == "second") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      }
+    },
+    // -------查看物资详情 (已接收)
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+// 根据销售订单id查询物资信息
+      this.axios
+      .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          console.log("res.data.data",res.data.data)
+          this.tableData = res.data.data;
+        });
+    },
 
-		// -------查看物资详情(未接收)
-		detailclick2(row) {
-		// 记录重复点击次数
-		if (this.oldRow2 === row) {
-			this.oldRowCount2 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table2.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow2 != "") {
-			if (this.oldRow2 != row) {
-			if (this.oldRowCount2 % 2 === 1) {
-				this.$refs.table2.toggleRowExpansion(this.oldRow2);
-			} else {
-				this.oldRowCount2 = 1;
-			}
-			} else {
-			this.oldRow2 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow2 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData2 = res.data.data;
-			});
-		},
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          console.log("res.data.data",res.data.data)
+          this.tableData1 = res.data.data;
+        });
+    },
 
-		 }
-	}
+    // -------查看物资详情(未接收)
+    detailclick2(row) {
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          this.tableData2 = res.data.data;
+        });
+    },
+  },
+};
 </script>
 <style lang="scss" scode>
-	.steel_inbound {
-		.sache {
-			padding: 1.25rem 0.375rem;
-			.el-input {
-			width: 20%;
-			margin-right: 1.25rem;
-			}
-		}
-	}
+.steel_inbound {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
 </style>

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

@@ -0,0 +1,54 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "",
+      },
+      input: "",
+    };
+  },
+  created(){
+      if(getCookie('orgCode') == 'chengyunshang'){
+          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
+      }else{
+          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
+      }
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllSaleReport?api=423&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "",
+      },
+      input: "",
+    };
+  },
+  created(){
+      if(getCookie('orgCode') == 'chengyunshang'){
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
+      }else{
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
+      }
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?api=424&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "",
+      },
+      input: "",
+    };
+  },
+  created(){
+      if(getCookie('orgCode') == 'chengyunshang'){
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
+      }else{
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
+      }
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?api=425&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -10,6 +10,9 @@ import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
 import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
 import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
 import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
+import sporadicReportEnterFactory from '../components/sporadicReport/sporadicReportEnterFactory.vue'
+import sporadicReportExFactory from '../components/sporadicReport/sporadicReportExFactory.vue'
+import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -24,6 +27,11 @@ const constantRouterMap = [
       {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
       {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
       {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
+      {path: 'sporadicReportEnterFactory',name:'sporadicReportEnterFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportEnterFactory},
+      {path: 'sporadicReportExFactory',name:'sporadicReportExFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportExFactory},
+      {path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
+
+
     ]
   }
 ];