Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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','statisticalReport','appoint','sale','RMS','TMS'];
+let devModules = ['all']
+// let devModules = ['index','appoint','sale','RMS'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward','SporadicManage']
 // let devModules = ['index','sale','RMS']

config/index.js

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

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/components/DilCommonUI/packages/table/src/table.vue

@@ -7,7 +7,6 @@
       row-key="ROW_ID"
       :stripe="stripe"
       :border="border"
-      :row-class-name="tableRowClassName"
       :cell-class-name="cellClassName"
       :height="height"
       :highlight-current-row="highlightCurrentRow"

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

@@ -127,10 +127,10 @@
               </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
-                <el-input
+                <el-input v-if="scope.row.haveMeter==1"
                   class="textinput111"
                   v-model.number="scope.row.meterNumber"
-                  placeholder="(非必填)"
+                  placeholder="(必填)"
                 ></el-input>
               </template>
               <!-- 分装车数 -->
@@ -228,7 +228,7 @@
               </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
-                <el-input
+                <el-input v-if="scope.row.haveMeter==1"
                   class="textinput"
                   v-model.number="scope.row.meterNumber"
                 ></el-input>
@@ -819,7 +819,9 @@ export default {
         }else{
           getisPound = 1;
         }
-        var addmap = {
+        //若物资为带有盘螺、盘圆、盘元，默认无米数
+        if(e.materialName.includes("盘螺")||e.materialName.includes("盘圆")||e.materialName.includes("盘元")){
+          var addmap = {
           materialName: e.materialName,
           Specification: e.materialSpecification+e.materialModel,
           materialCode: e.materialCode,
@@ -828,7 +830,23 @@ export default {
           isPound: getisPound,
           //物资Id
           materialId: e.materialId,
-        };
+          //无米数
+          haveMeter: 0
+          };
+        }else{
+          var addmap = {
+          materialName: e.materialName,
+          Specification: e.materialSpecification+e.materialModel,
+          materialCode: e.materialCode,
+          orderPlanWeight: null,
+          meterNumber: null,
+          isPound: getisPound,
+          //物资Id
+          materialId: e.materialId,
+          //有米数
+          haveMeter: 1
+          };
+        }
         this.materialList.push(addmap);
       });
       this.materialList1 = [];
@@ -878,7 +896,7 @@ export default {
     addMaterialToSaleOrder(){
       if(this.materialList.length==0){
         this.$message.warning("请至少为这一车添加一个物资！");
-      }else if(!this.saleShipperAddressName){
+      }else if(!this.saleShipperAddressName&&this.values=='no'){
         this.$message.warning("收货地址未填写！");
       }else if(this.materialList.length==1&&this.materialList[0].carNumber!=null){
           var eachOrderPlanWeight = this.materialList[0].orderPlanWeight/this.materialList[0].carNumber;
@@ -898,6 +916,7 @@ export default {
             saleDateOfReceipt: this.saleDateOfReceipt,
             saleOrderConsigneeTel: this.saleOrderConsigneeTel,
             materialId: e.materialId,
+            haveMeter: e.haveMeter
           };
           this.selectionList.push(addmap);
           //最大车序号加1
@@ -923,6 +942,7 @@ export default {
               saleDateOfReceipt: this.saleDateOfReceipt,
               saleOrderConsigneeTel: this.saleOrderConsigneeTel,
               materialId: e.materialId,
+              haveMeter: e.haveMeter
             };
             this.selectionList.push(addmap);
           });
@@ -979,6 +999,13 @@ export default {
         this.selectionList[this.indexChangeMaterial].Specification=this.selectedMaterialSpecification+this.selectedMaterialModel;
         this.selectionList[this.indexChangeMaterial].materialCode=this.selectedMaterialModel;
         this.selectionList[this.indexChangeMaterial].isPound=getisPound;
+        //确定更改的物资有无米数
+        if(this.selectedMaterialName.includes("盘螺")||this.selectedMaterialName.includes("盘圆")||this.selectedMaterialName.includes("盘元")){
+          this.selectionList[this.indexChangeMaterial].haveMeter = 0;
+          this.selectionList[this.indexChangeMaterial].meterNumber = null;
+        }else{
+          this.selectionList[this.indexChangeMaterial].haveMeter = 1;
+        }
         //重新初始化
         this.indexChangeMaterial = null;
         this.selectedMaterialId = null;

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

@@ -62,15 +62,21 @@
 
               <!-- 承运商 -->
               <template v-if="item.prop == 'carrierName'">
-                 <el-select v-model="scope.row.carrierName" placeholder="请选择"  
-                 @change="batchUpdateValue(scope.row,scope.$index)">
-                  <el-option
-                    v-for="item in carrierNameOptions[scope.$index]"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                <el-autocomplete
+                    class="inline-input"
+                    v-model="scope.row.carrierName"
+                    :fetch-suggestions="querySearch1"
+                    placeholder="请输入承运商名称"
+                    :trigger-on-focus="false"
+                    @change="batchUpdateValue(scope.row,scope.$index)"
+                    @select="handleSelect1"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name" v-if="item.carrierName">
+                        {{ item.carrierName }}
+                      </div>
+                    </template>
+                  </el-autocomplete>
               </template>
 
               <!-- 物资件数 -->
@@ -163,6 +169,8 @@ export default {
       pos:0,
       //加载
       selectLineLoading:false,
+      //所有选中承运商Id和承运商名称暂存
+      carrierIdAndName: [],
       //承运商下拉框中的值
       carrierNameOptions:[],
       //当前车序号物资
@@ -299,12 +307,8 @@ export default {
                 saleDateOfReceipt: e.receiptDate,
                 saleOrderConsignee: e.saleOrderConsignee,
                 saleOrderConsigneeTel: e.saleOrderConsigneeTel,
-                priceValue: null,
-                priceId: null,
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
             //初始化每个车的线路
@@ -312,6 +316,40 @@ export default {
         });
       });
     },
+
+    //承运商弹出层
+    handleSelect1(item) {
+      let carrierIdAndNameItem = {
+        carrierId : item.carrierId,
+        carrierName : item.carrierName
+      }
+      this.carrierIdAndName.push(carrierIdAndNameItem);
+    },
+    //以下是承运商边输边查搜索
+    querySearch1(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurants = res.data.data;
+            var results = queryString
+              ? restaurants.filter(this.createFilter1(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter1(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+
     onInput(val){
       if(!isNumber(val)){
         this.$message.warning('重量/电话号码请输入数字')
@@ -359,7 +397,7 @@ export default {
         })
         .catch(() => {this.$message({ type: "info", message: "已取消删除",});});
     },
-    //失焦事件后确定车牌号与承运商是否有绑定关系
+    //确定车牌号与承运商是否有绑定关系
     checkRelationship(index){
       if(this.selectionList[index].carrierId!=null){
         //暂存车牌号
@@ -388,19 +426,7 @@ export default {
     },
     //车牌号弹出层
     handleSelect(item) {
-      console.log("item")
-        // let mapValue = {
-        //   capacityNumber:item.capacityNumber,
-        //   carrierId:this.receiveCarrierId,
-        //   carrierName:this.receiveCarrierName
-        // }
-        // this.axios
-        // .post("/api/v1/uc/isInCapacityCarrier", mapValue)
-        // .then((res)=>{
-        //   if(res.data.code=="201"){
-        //     this.bindRelationship(mapValue);
-        //   }
-        // });
+      console.log("获取下拉值！")
     },
 
     //以下是车牌号边输边查搜索
@@ -453,7 +479,13 @@ export default {
             .then(() => {
               var mapList = [];
               for(var i=0;i<this.spanArr.length;i++){
-                if(this.spanArr[i]>0){
+                  if(this.spanArr[i]>0){
+                  //从所有选中承运商Id和承运商名称暂存中取出当前行的承运商Id
+                  this.carrierIdAndName.forEach((item) => {
+                    if(this.selectionList[i].carrierName==item.carrierName){
+                      this.selectionList[i].carrierId = item.carrierId;
+                    }
+                  })
                   var mapItem = {
                   //车牌号
                   capacityNumber : null,
@@ -463,14 +495,11 @@ export default {
                   carrierId : 0,
                   //线路Id
                   lineId : 0,
-                  //运输单价Id
-                  priceId : 0
                 }
                 mapItem.capacityNumber = this.selectionList[i].capacityNumber,
                 mapItem.saleOrderMaterialId = this.selectionList[i].saleOrderMaterialId,
                 mapItem.carrierId = this.selectionList[i].carrierId,
                 mapItem.lineId = this.selectionList[i].lineId,
-                mapItem.priceId = this.selectionList[i].priceId
                 mapList.push(mapItem);
                 }
               }
@@ -494,23 +523,9 @@ export default {
 
     //批量修改内层值
     batchUpdateValue(row,index){
-      //单价以及单价Id
-        var priceValue = null;
-        var priceId = null;
-        var carrierName = null;
-        this.carrierNameOptions[index].forEach((e) => {
-          if (row.carrierName == e.value) {
-            priceValue = e.priceValue;
-            priceId = e.priceId;
-            carrierName = e.label;
-          }
-        });
         for(var i=index;i<this.spanArr[index]+index;i++){
           this.selectionList[i].capacityNumber=row.capacityNumber;
-          this.selectionList[i].carrierId=row.carrierName;
-          this.selectionList[i].carrierName=carrierName;
-          this.selectionList[i].priceValue=priceValue;
-          this.selectionList[i].priceId=priceId;
+          this.selectionList[i].carrierName=row.carrierName;
         }
     },
     //初始化线路

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

@@ -280,14 +280,6 @@ export default {
           if(e.saleOrderConsigneeTel=="null"){
             e.saleOrderConsigneeTel = null
           }
-          var priceValueFirst = 0;
-          var priceIdFirst = 0;
-          e.carrierAndPriceList.forEach((a)=>{
-              if(a.id == e.carrierId){
-                  priceValueFirst = a.priceValue;
-                  priceIdFirst = a.priceId;
-              }
-          })
             //带承运商初始化派车表格
             var addmap = {
                 truckNo: e.truckNo,
@@ -307,13 +299,9 @@ export default {
                 saleShipperAddressName:e.place,
                 saleDateOfReceipt: e.receiptDate,
                 saleOrderConsignee: e.saleOrderConsignee,
-                saleOrderConsigneeTel: e.saleOrderConsigneeTel,
-                priceValue: priceValueFirst,
-                priceId: priceIdFirst
+                saleOrderConsigneeTel: e.saleOrderConsigneeTel
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
             //初始化每个车的线路
@@ -472,14 +460,11 @@ export default {
                   carrierId : 0,
                   //线路Id
                   lineId : 0,
-                  //运输单价Id
-                  priceId : 0
                 }
                 mapItem.capacityNumber = this.selectionList[i].capacityNumber,
                 mapItem.saleOrderMaterialId = this.selectionList[i].saleOrderMaterialId,
                 mapItem.carrierId = this.selectionList[i].carrierId,
                 mapItem.lineId = this.selectionList[i].lineId,
-                mapItem.priceId = this.selectionList[i].priceId
                 mapList.push(mapItem);
                 }
               }

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

@@ -14,26 +14,44 @@
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 已审批 -->
-       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="80">
+      <!-- 未上报 -->
+      <el-tab-pane label="未上报" name="first">
+        <dilTable v-bind.sync="option" ref="table3">
+          <el-table-column fixed="right" label="操作" align="center" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="detailclick(scope.row)"
+                @click="uploadclick(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >上传</el-button
+              >
+              <!-- <el-button
+                @click="click(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >修改</el-button
+              > -->
+              <el-button
+                type="text"
+                size="small"
+                @click="deleteclick(scope.row.saleOrderId)"
+                >删除</el-button
+              >
+              <el-button
+                @click="detailclick3(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 :data="tableData3" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -49,44 +67,26 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 未上报 -->
-      <el-tab-pane label="未上报" name="first">
-        <dilTable v-bind.sync="option" ref="table3">
-          <el-table-column fixed="right" label="操作" align="center" width="200">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
+        <dilTable v-bind.sync="option4" ref="table">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
-                @click="uploadclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >上传</el-button
-              >
-              <!-- <el-button
-                @click="click(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >修改</el-button
-              > -->
-              <el-button
-                type="text"
-                size="small"
-                @click="deleteclick(scope.row.saleOrderId)"
-                >删除</el-button
-              >
-              <el-button
-                @click="detailclick3(scope.row)"
+                @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="tableData3" border >
+                <el-table :data="tableData" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -146,7 +146,7 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      activeName: "four",
+      activeName: "first",
       drawer: false,
       input: "",
       index: "",

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

@@ -49,15 +49,21 @@
 
               <!-- 承运商 -->
               <template v-if="item.prop == 'carrierName'">
-                 <el-select v-model="scope.row.carrierName" placeholder="请选择" 
-                  @change="batchUpdateValue(scope.row,scope.$index)">
-                  <el-option
-                    v-for="item in carrierNameOptions[scope.$index]"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="scope.row.carrierName"
+                    :fetch-suggestions="querySearch"
+                    placeholder="请输入承运商名称"
+                    :trigger-on-focus="false"
+                    @change="batchUpdateValue(scope.row,scope.$index)"
+                    @select="handleSelect"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name" v-if="item.carrierName">
+                        {{ item.carrierName }}
+                      </div>
+                    </template>
+                  </el-autocomplete>
               </template>
 
               <!-- 物资件数 -->
@@ -140,6 +146,8 @@ export default {
       spanArr: [],
       //pos是spanArr的索引
       pos:0,
+      //所有选中承运商Id和承运商名称暂存
+      carrierIdAndName: [],
       //承运商下拉框中的值
       carrierNameOptions:[],
       //当前车序号物资
@@ -260,14 +268,46 @@ export default {
                 saleOrderConsigneeTel: e.saleOrderConsigneeTel,
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
           }
         });
       });
     },
+
+    //承运商弹出层
+    handleSelect(item) {
+      let carrierIdAndNameItem = {
+        carrierId : item.carrierId,
+        carrierName : item.carrierName
+      }
+      this.carrierIdAndName.push(carrierIdAndNameItem);
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurants = res.data.data;
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+
     onInput(val){
       if(!isNumber(val)){
         this.$message.warning('重量/电话号码请输入数字')
@@ -307,6 +347,12 @@ export default {
               //取得要发送的车序号和它的承运商
               for(var i=0;i<this.spanArr.length;i++){
                   if(this.spanArr[i]>0){
+                      //从所有选中承运商Id和承运商名称暂存中取出当前行的承运商Id
+                      this.carrierIdAndName.forEach((item) => {
+                        if(this.selectionList[i].carrierName==item.carrierName){
+                          this.selectionList[i].carrierId = item.carrierId;
+                        }
+                      })
                       var oneCarAndCarrier = {
                           //车序号Id
                           saleOrderMaterialId : 0,

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>

src/views/statisticalReport/components/defendCapacity/getCapacityByDefend.vue

@@ -0,0 +1,46 @@
+<template>
+  <!-- 抽查车牌号页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <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>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "api/v1/tms/getCapacityByDefend?apiId=469",
+      },
+    };
+  },
+  created(){
+   
+  },
+  methods: {
+    onclick() {
+          this.option.requestUrl="api/v1/tms/getCapacityByDefend?apiId=469&con="+this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -23,6 +23,7 @@ import getUnLoading from '../components/inwardReport/getUnLoading.vue'
 import purchaseMineral from '../components/purachaseMineral.vue'
 import inwardSporadicReport from '../components/sporadicReport/inwardSporadicReport.vue'
 import getInstall from '../components/inwardReport/getInstall.vue'
+import getCapacityByDefend from '../components/defendCapacity/getCapacityByDefend.vue'
 
 Vue.use(Router)
 
@@ -51,6 +52,7 @@ const constantRouterMap = [
       {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral},
       {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport},
       {path: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
+      {path: 'getCapacityByDefend', name: 'getCapacityByDefend', meta: {code: 'xtpzgl-yhgl'}, component: getCapacityByDefend}
     ]
   }
 ];