合并

build/utils.js

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

package.json

@@ -54,6 +54,7 @@
     "vue-baidu-map": "^0.21.19",
     "vue-clipboard2": "^0.2.1",
     "vue-element-bigdata-table": "^1.3.1",
+    "vue-print-nb": "^1.7.5",
     "vue-property-decorator": "^8.2.1",
     "vue-quill-editor": "^3.0.5",
     "vue-router": "^3.0.1",

src/views/sale/app.js

@@ -15,6 +15,9 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+import Print from 'vue-print-nb';
+Vue.use(Print);
+
 
 import 'xe-utils' 
 import VXETable from 'vxe-table'

src/views/sale/components/offSiteTransportation/inTransit.vue

@@ -15,23 +15,7 @@
   </el-form-item>
   <el-form-item>
      <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-select v-model="inputValue" placeholder="产品分类">
-        <el-option
-          v-for="item in inputValues"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <!-- <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-autocomplete
-        popper-class="my-autocomplete"
-        v-model="inputValue"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容" 
-      >
-        <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-      </el-autocomplete> -->
+      <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
   </el-form-item>
   <el-form-item>
       <label class="el-form-item__label" style="width: auto;">车牌号</label>
@@ -47,23 +31,7 @@
   </el-form-item> 
    <el-form-item>
      <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-      <el-select v-model="gatepostName" placeholder="门岗名称">
-        <el-option
-          v-for="item in gatepostNames1"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <!-- <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-       <el-autocomplete
-            popper-class="my-autocomplete"
-            v-model="gatepostName"
-            :fetch-suggestions="querySearch2"
-            placeholder="请输入内容" 
-          >
-            <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-          </el-autocomplete> -->
+     <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
   </el-form-item> 
   <el-form-item>
     <label class="el-form-item__label" style="width: auto;">报警类型</label>
@@ -242,11 +210,13 @@ export default {
       },
        option2: {
         // 表格请求数据的地址
-        // requestUrl: "/api/v1/tms/getFinishTruckOrderInfo?apiId=160",
+        requestUrl: "/api/v1/otms/getFinishTruckOrderInfo?apiId=468",
       },
       pathOption:{
            orderNumber:'',
         capacityNumber:'',
+         startPointName:'',
+        endPointName:'',
       },
       mileOption:{
         orderNumber:''
@@ -367,31 +337,31 @@ export default {
       //改变执行中条件
       this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "gatepostName1":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "consigneeCompanyNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="second"){
       //改变已完成条件              
       this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "gatepostName1":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "consigneeCompanyNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="third"){
       //改变有异常条件              
       this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
+                      "materialNames": this.inputValue,
                       "capacityNumber1": this.capacityNumber1,
                       "carrierName1":this.carrierName,
                       "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
-                      "gatepostName1":this.gatepostName,
+                      "outGatepostNames":this.gatepostName,
                       "consigneeCompanyName1": this.consigneeCompanyName1});
       }                              
     },
@@ -399,15 +369,20 @@ export default {
 
     //other
     click(row) {
-      console.log(row,"row")
+     
         this.pathOption.orderNumber=row.orderNumber;
         this.pathOption.capacityNumber=row.capacityNumber;
+        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
+        this.pathOption.endPointName=row.deliveryAddress,
+         console.log(this.pathOption,"this.pathOption")
         this.value7=true;
       // this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
     },
     historyclick(row){
+      
       this.pathOption.orderNumber=row.orderNumber;
         this.pathOption.capacityNumber=row.capacityNumber;
+        
         this.value7=true;
       //this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
     },

src/views/sale/components/offSiteTransportation/mapTest.vue

@@ -3,9 +3,9 @@
         <div id="amap-container"></div>
          <div class="controller">
              <div class="in_transit_information">
-                 <label class="item_details">起点:{{transportDetail.startPointName}}</label>
+                 <label class="item_details">起点:{{startPointName}}</label>
                  <br/>
-                 <label class="item_details">终点:{{transportDetail.endPointName}}</label>
+                 <label class="item_details">终点:{{endPointName}}</label>
                  <br/>
              </div>
              <div class="driving_information">  
@@ -57,6 +57,8 @@ export default {
     props:{
         orderNumber:'',
         capacityNumber:'',
+        startPointName:'',
+        endPointName:'',
         startTime:'',
         endTime:'',
     },
@@ -159,7 +161,7 @@ export default {
                     lon:""
                 },
                 //起点位置
-                startPointName:"中国达州市通川区",
+                startPointName:"中国达州市通川区", 
                 //起点位置经纬度
                 startPoint:{
                     lon:"114.03922119568348",
@@ -277,7 +279,7 @@ export default {
                 that.initPathSimplifier();
                 that.threeMarker();
                 console.log("that.listPath[0]",that.listPath)
-                that.initCustomMarkes(that.ctmarkes.title+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
+                that.initCustomMarkes(that.capacityNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
                 that.endline();
             });
         },

src/views/sale/components/saleSelfMachine/printScan.vue

@@ -50,12 +50,13 @@ export default {
         //}
          if(this.orderNumber!=null&&this.orderNumber.length==21){
             if(this.orderNumber.startsWith('WYSDD')==true||this.orderNumber.startsWith('wysdd')==true){
+          
             this.$router.push({
                 path:"/saleSelfMachine?orderNumber="+this.orderNumber,
             })
-        
+            }
             }   
-        }
+        
     },3000)
     this.$once('hook:beforeDestroy', ()=>{
         clearInterval(timer)

src/views/sale/components/saleSelfMachine/printWarranty.vue

@@ -49,8 +49,11 @@ export default {
         )
         .then((res) => {
           console.log("res.data.data",res.data.data)
-          if(res.data.code==201){
+          console.log("res.data.code",res.data.code)  
+          if(res.data.data==-1){
             this.$message("质保书正在紧张制作中，请耐心等待！")
+          }else if(res.data.data==-2) {
+            this.$message("该车还未装货")
           }else{
             res.data.data.forEach((e) => {
               console.log(e)

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

@@ -1,129 +1,120 @@
 <template>
-  <!-- 抵达实绩信息页面 -->
-  <div class="arrivalResult">
-    <div class="top">
-      <el-form :inline="true" style="margin-top: 0.5rem;">
-        <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">时间段</label>
-         <el-date-picker
-      v-model="dateValue"
-      type="daterange"
-      range-separator="至"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期">
-    </el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-autocomplete
-        popper-class="my-autocomplete"
-        v-model="inputValue"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容" 
+  <!-- 抵达页面 -->
+   <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <span>抵达时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
       >
-        <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-      </el-autocomplete>
-        </el-form-item>
-        <el-form-item>
-      <label class="el-form-item__label" style="width: auto;margin-top: 0.4rem;">车牌号</label>
-      </el-form-item>
-      <el-form-item>
-          <el-input class="el-form-item__content" v-model="capacityNumber1" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item>
-          <label class="el-form-item__label" style="width: auto;margin-top: 0.4rem;">收货单位</label>
-      </el-form-item>
-      <el-form-item>
-          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-      </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-        </el-form-item>
-      </el-form>
-
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+        <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>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-button type="primary" @click="refresh">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+             <el-button
+              type="text"
+              size="mini"
+              @click="photo(scope)"
+            >
+              满货箱照片
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </div>
-
-    <dilTable ref="tab" v-bind.sync="option">
-      <el-table-column fixed="right" label="操作" width="110">
-        <template slot-scope="scope">
-          <el-button @click="toPhotoClick(scope.row.resultFullContainerPhoto)" type="text" size="small" style="font-size: 17px"
-            >浏览图片</el-button
-          >
-        </template>
-      </el-table-column>
-    </dilTable>
   </div>
 </template>
 
-
 <script>
-
+import { sjTime } from '@/utils/sharedJsFile';
 export default {
-  name: "arrivalResult",
+  name: "homeworkPath",
   data() {
     return {
-      dateValue:[new Date(), new Date()],
-      inputValue:"",
-      capacityNumber1:"",
-      consigneeCompanyName1:"",
-      status: "",
-      state: "",
-      option: {       
+      restaurants: [],
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getArrivalResultInfo?apiId=136",
+        requestUrl: "/api/v1/tms/getReceiptResult?apiId=470",
       },
     };
   },
-  mounted() {
-    this.restaurants = this.loadAll();
+  created(){
+   
   },
   methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
+    photo(scope){
+      console.log(scope.row.orderNumber)
+     this.axios
+       .post("/api/v1/tms/getReceiptPhoto?orderNumber="+scope.row.orderNumber)
+       .then((res)=>{
+         console.log("res.data.data",res.data.data)
+       });
     },
-    loadAll() {
-      return [
-        { value: "带钢"},
-        { value: "微粉"},
-        { value: "螺纹钢"},
-        { value: "钢坯"},
-        { value: "其他"},
-      ];
-    },
-
-    onSearch(){
-      //改变查询条件
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});                         
-    },
-
-    toPhotoClick(resultFullContainerPhoto){
-      this.$router.push("/arrivalPhoto?resultFullContainerPhoto="+resultFullContainerPhoto);
-      
-    }
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      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{
+          this.startTime = null;
+          this.endTime = null;
+          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; 
+      }
     },
+   }
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 20px 30px;
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>