fsaf

build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
- let devModules = ['index','queue']
+ let devModules = ['index','sale']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']

config/index.js

@@ -64,7 +64,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://192.168.1.107:8019",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 抵达页面 -->
-   <div class="purchasFuelNewMonitor">
+  <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
       <span>抵达时间：</span>
       <el-date-picker
@@ -10,98 +10,72 @@
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-        <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        clearable>
-      </el-input>
+      <el-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">
-       <el-table
-         @filter-change="filterChange"
-         :data="dataTabel"
-         :span-method="objectSpanMethod"
+      <el-table
+        @filter-change="filterChange"
+        :data="dataTabel"
+        :span-method="objectSpanMethod"
         border
-        style="width: 100%; margin-top: 20px">
-        <el-table-column
-          prop="orderNumber"
-          label="运输订单号">
-        </el-table-column>
-        <el-table-column
-          prop="capacityNumber"
-          label="车牌号">
-        </el-table-column>
-        <el-table-column
-          prop="materialName"
-          label="物资名称">
-        </el-table-column>
-        <el-table-column
-          prop="materialSpecification"
-          label="规格">
+        style="width: 100%; margin-top: 20px"
+      >
+        <el-table-column prop="orderNumber" label="运输订单号">
         </el-table-column>
-        <el-table-column
-          prop="materialModel"
-          label="型号">
+        <el-table-column prop="capacityNumber" label="车牌号">
         </el-table-column>
-        <el-table-column
-          prop="resultNetWeight"
-          label="净重">
+        <el-table-column prop="materialName" label="物资名称">
         </el-table-column>
-        <el-table-column
-          prop="resultGrossWeightTime"
-          label="净重时间">
+        <el-table-column prop="materialSpecification" label="规格">
         </el-table-column>
-        <el-table-column
-          prop="resultOutGateTime"
-          label="出厂时间">
+        <el-table-column prop="materialModel" label="型号"> </el-table-column>
+        <el-table-column prop="resultNetWeight" label="净重"> </el-table-column>
+        <el-table-column prop="resultGrossWeightTime" label="净重时间">
         </el-table-column>
-        <el-table-column
-          prop="outGatepostName"
-          label="出厂门岗">
+        <el-table-column prop="resultOutGateTime" label="出厂时间">
         </el-table-column>
-        <el-table-column
-          prop="carrierName"
-          label="承运商名称">
+        <el-table-column prop="outGatepostName" label="出厂门岗">
         </el-table-column>
-        <el-table-column
-          prop="deliveryAddress"
-          label="详细收货地址">
+        <el-table-column prop="carrierName" label="承运商名称">
         </el-table-column>
-        <el-table-column
-          prop="receiveName"
-          label="客户名称">
+        <el-table-column prop="deliveryAddress" label="详细收货地址">
         </el-table-column>
-        <el-table-column
-          prop="resultArrivalAddress"
-          label="抵达收货点的地址">
+        <el-table-column prop="receiveName" label="客户名称"> </el-table-column>
+        <el-table-column prop="resultArrivalAddress" label="抵达收货点的地址">
         </el-table-column>
-        <el-table-column
-          prop="insertTime"
-          label="抵达作业时间">
+        <el-table-column prop="insertTime" label="抵达作业时间">
         </el-table-column>
         <el-table-column fixed="right" label="照片游览">
-          <template slot-scope="scope">
-            <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
-                抵达满货照片</el-button>
-          </template>
-      </el-table-column>
+          <template slot-scope="scope">
+            <el-button
+              @click="toPhotoClick(scope.row.orderNumber)"
+              type="text"
+              size="small"
+              style="font-size: 6px"
+            >
+              抵达满货照片</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
-      <dilTable ref="excelDom" v-bind.sync="option" >
-          <el-table-column fixed="right" label="照片游览" width="120">
-          <template slot-scope="scope">
-            <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
-                抵达满货照片</el-button>
-          </template>
-      </el-table-column>
+      <dilTable ref="excelDom" v-bind.sync="option">
+        <el-table-column fixed="right" label="照片游览" width="120">
+          <template slot-scope="scope">
+            <el-button
+              @click="toPhotoClick(scope.row.orderNumber)"
+              type="text"
+              size="small"
+              style="font-size: 6px"
+            >
+              抵达满货照片</el-button
+            >
+          </template>
+        </el-table-column>
       </dilTable>
     </div>
     <!-- 分页器 -->
@@ -116,62 +90,61 @@
       @size-change="sizeChange"
     >
     </el-pagination>
-     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
-        <div class="demo-image__preview">
-          <el-image 
-            style=" height:731px;text-align:center"
-            :src="src" 
-            :preview-src-list="srcList">
-          </el-image>
-        </div>
-      </vxe-modal>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+      <div class="demo-image__preview">
+        <el-image
+          style=" height:731px;text-align:center"
+          :src="src"
+          :preview-src-list="srcList"
+        >
+        </el-image>
+      </div>
+    </vxe-modal>
   </div>
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile';
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
-      spanArr:[],
-      dataTabel:[],
+      spanArr: [],
+      dataTabel: [],
       // 自己的数据总条数
       dataTotal: 0,
       // 自己的每页显示条目个数
       dataPageSize: 10,
       // 每页显示个数选择器的选项设置
       pageSizes: [10, 20, 50, 100, 200, 1000, 50000],
-      layout:  "total, prev, pager, next, sizes, jumper",
+      layout: "total, prev, pager, next, sizes, jumper",
       // 自己的当前页面数
       dataCurrentPage: 1,
       // 是否启用分页器
       isPagination: true,
       restaurants: [],
-      srcList:[],
-      dataColumnData:[],
-      columnData:[],
-      src:"",
-      isShow:false,
+      srcList: [],
+      dataColumnData: [],
+      columnData: [],
+      src: "",
+      isShow: false,
       input: "",
       startTime: null,
       endTime: null,
       // 表格请求数据的地址
       requestUrl: "/api/v1/otms/getArrivalResult?apiId=470",
-      beforeRow:0,
-      thatrowspan:1,
+      beforeRow: 0,
+      thatrowspan: 1,
       option: {
-        pageSize:10,
-        pageNum:1,
-      },
+        pageSize: 10,
+        pageNum: 1
+      }
     };
   },
-  mounted(){
-    this.requestData(this.option)
-  },
-  created(){
-   
+  mounted() {
+    this.requestData(this.option);
   },
+  created() {},
   methods: {
     //记录每一行的合并数
     getSpanArr(data) {
@@ -183,7 +156,7 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].cxh === data[i - 1].cxh) {
+          if (data[i].orderNumber === data[i - 1].orderNumber) {
             this.spanArr[this.pos] += 1;
             this.spanArr.push(0);
           } else {
@@ -195,7 +168,16 @@ export default {
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (
-        columnIndex!=2||columnIndex!=3||columnIndex!=4||columnIndex!=5
+        columnIndex == 0 ||
+        columnIndex == 1 ||
+        columnIndex == 7 ||
+        columnIndex == 8 ||
+        columnIndex == 9 ||
+        columnIndex == 10 ||
+        columnIndex == 11 ||
+        columnIndex == 12 ||
+        columnIndex == 13 ||
+        columnIndex == 14
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -205,68 +187,6 @@ export default {
         };
       }
     },
-    //  objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    //    let that=this;
-    //    if(columnIndex==2||columnIndex==3||columnIndex==4||columnIndex==5){
-    //         return {
-    //           rowspan: 1,
-    //           colspan: 1
-    //         };
-    //      }else{
-    //        if(row >=that.beforeRow){
-    //          if((that.dataTabel[rowIndex+1].orderNumber==row.orderNumber)){
-    //            for(let i=0;i<that.dataTabel.length-(rowIndex+1);i++){
-    //               if((that.dataTabel[rowIndex+1+i].orderNumber==row.orderNumber)){
-    //                   that.thatrowspan++;
-    //                   that.beforeRow=rowIndex+1+i;
-    //               }else{
-    //                 let myrowspan=that.thatrowspan;
-    //                 that.thatrowspan=1;
-    //                 return {
-    //                   rowspan: myrowspan,
-    //                   colspan: 1
-    //                 };  
-    //               }
-    //            }
-    //          }
-    //        }else{
-    //           return {
-    //             rowspan: 0,
-    //             colspan: 0
-    //         };
-    //      }
-    //   //  if(rowIndex==0){
-    //   //      if(columnIndex==2||columnIndex==3||columnIndex==4||columnIndex==5){
-    //   //       return {
-    //   //         rowspan: 1,
-    //   //         colspan: 1
-    //   //     };
-    //   //    }else{
-    //   //       return {
-    //   //         rowspan: 3,
-    //   //         colspan: 1
-    //   //     };
-    //   //    }
-         
-    //   //  }else{
-    //   //     if(columnIndex==2||columnIndex==3||columnIndex==4||columnIndex==5){
-    //   //       return {
-    //   //         rowspan: 1,
-    //   //         colspan: 1
-    //   //     };
-    //   //    }else if((that.dataTabel[rowIndex-1].orderNumber!=row.orderNumber)){
-    //   //       return {
-    //   //         rowspan: 1,
-    //   //         colspan: 1
-    //   //     };
-    //   //    }else{
-    //   //      return {
-    //   //         rowspan: 0,
-    //   //         colspan: 0
-    //   //     };
-    //   //   }
-    //   }
-    // },
     // 参数的值是一个对象，对象的 key 是 column 的 columnKey，对应的 value 为用户选择的筛选条件的数组。
     filterChange(filters) {
       let value = {};
@@ -292,16 +212,16 @@ export default {
       this.requestData({});
       this.$emit("update:size-change", val);
     },
-     // 通过请求获取数据
+    // 通过请求获取数据
     requestData(options) {
       let pageNum = undefined;
       let pageSize = undefined;
-      
+
       if (options) {
         pageNum = options.pageNum;
         pageSize = options.pageSize;
       }
-      console.log(this.requestUrl)
+      console.log(this.requestUrl);
       if (this.requestUrl) {
         // 处理请求地址逻辑
         let url;
@@ -311,44 +231,44 @@ export default {
           url = this.requestUrl;
         }
         // 判断是否需要在请求体中放入参数
-        if(this.requestQuery){
-          this.dataRequestQuery=this.requestQuery;
+        if (this.requestQuery) {
+          this.dataRequestQuery = this.requestQuery;
           // console.log(this.dataRequestQuery.resultBreakId)
         }
         let data = undefined;
         for (const key in this.dataRequestQuery) {
           const val = this.dataRequestQuery[key];
-          console.log(val)
-          if (val||val==0) {
+          console.log(val);
+          if (val || val == 0) {
             if (!data) data = {};
             data[key] = val;
           }
         }
         //判断是否是带分页查询
-        if(this.isKuang){
-          console.log("AAAAAAAAAAAAAAAAAAAAA")
+        if (this.isKuang) {
+          console.log("AAAAAAAAAAAAAAAAAAAAA");
           // 发送请求
           this.axios
-          .post(url, data, {
-            // 请求地址 中
-            params: {
-              pageNum: 1,
-              pageSize: pageSize || this.dataPageSize
-            }
-          })
-          .then(response => {
-            let d = response.data.data;
-            this.dataTabel = d.list;
-            this.spanArr(this.dataTabel)
-            this.dataTotal = d.total;
-            console.log(this.dataTabel)
-            console.log("this.dataTabe")
-            //执行成功的回调
-            this.$emit('func',response.data.data);
-            this.refreshColumnData(d.columnData);
-          });
-        }else{
-           console.log("BBBBBBBBBBBBBBBBBBBBBBBBB")
+            .post(url, data, {
+              // 请求地址 中
+              params: {
+                pageNum: 1,
+                pageSize: pageSize || this.dataPageSize
+              }
+            })
+            .then(response => {
+              let d = response.data.data;
+              this.dataTabel = d.list;
+              this.getSpanArr(this.dataTabel);
+              this.dataTotal = d.total;
+              console.log(this.dataTabel);
+              console.log("this.dataTabe");
+              //执行成功的回调
+              this.$emit("func", response.data.data);
+              this.refreshColumnData(d.columnData);
+            });
+        } else {
+          console.log("BBBBBBBBBBBBBBBBBBBBBBBBB");
           // 发送请求
           this.axios
             .post(url, data, {
@@ -361,13 +281,14 @@ export default {
             .then(response => {
               let d = response.data.data;
               this.dataTabel = d.list;
-              this.dataTotal = d.total; response
-              console.log(response)
-              console.log(this.dataTabel)
-              
-              console.log("this.dataTabe")
+              this.dataTotal = d.total;
+              this.getSpanArr(this.dataTabel);
+              response;
+              console.log(response);
+              console.log(this.dataTabel);
+              console.log("this.dataTabe");
               //执行成功的回调
-              this.$emit('func',response.data.data);
+              this.$emit("func", response.data.data);
               this.refreshColumnData(d.columnData);
             });
         }
@@ -378,58 +299,72 @@ export default {
     // 刷新表头显示数据
     refreshColumnData(columnData) {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
-      if (this.dataColumnData.length > 0){
-          return;
-      } 
-      console.log(columnData)
-      console.log("columnData")
+      if (this.dataColumnData.length > 0) {
+        return;
+      }
       // 如果前端有写表头，则加在后端表头前面
-       const d = this.columnData.concat(columnData);
+      const d = this.columnData.concat(columnData);
       // 把操作列拼接到最后一列
-       this.dataColumnData = d;
-       this.dataDropColumn = [].concat(this.dataColumnData);
+      this.dataColumnData = d;
+      this.dataDropColumn = [].concat(this.dataColumnData);
     },
-     toPhotoClick(orderNumber){
-      this.axios
-       .post("/api/v1/otms/getArrivalPhoto?orderNumber="+orderNumber)
-       .then((res)=>{
-          this.srcList=[];
-          this.src=res.data.data;
-          this.isShow=true;
-          this.srcList.push(res.data.data);
-       });
-       
-    },
-    photo(scope){
-      console.log(scope.row.orderNumber)
-    
+    toPhotoClick(orderNumber) {
+      this.axios
+        .post("/api/v1/otms/getArrivalPhoto?orderNumber=" + orderNumber)
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+    photo(scope) {
+      console.log(scope.row.orderNumber);
     },
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime){
+      if (this.startTime) {
         startTime = sjTime(this.startTime);
       }
-      if(this.endTime){
+      if (this.endTime) {
         endTime = sjTime(this.endTime);
       }
-      if(startTime && endTime){
-        if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getReceiptResult?apiId=470' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
-        }else{
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getReceiptResult?apiId=470" +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date() +
+            "&con=" +
+            this.input;
+        } else {
           this.startTime = null;
           this.endTime = null;
-          this.$message.warning('开始时间要比结束时间早')
+          this.$message.warning("开始时间要比结束时间早");
         }
-      }else{
-        console.log(startTime && endTime)
-         this.option.requestUrl = '/api/v1/tms/getReceiptResult?apiId=470' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+      } else {
+        console.log(startTime && endTime);
+        this.option.requestUrl =
+          "/api/v1/tms/getReceiptResult?apiId=470" +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date() +
+          "&con=" +
+          this.input;
       }
-    },
-   }
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .purchasFuelNewMonitor {
   .frameCalculation {
     width: 100%;
@@ -437,7 +372,7 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
     .el-input {
@@ -446,4 +381,4 @@ export default {
     }
   }
 }
-</style>
+</style>