asdas

src/views/TMS/components/bmsship/updateThreeSectionFeeDetails.vue

@@ -17,7 +17,7 @@
           <el-form-item label="水分检测费">
              <el-input type="number" placeholder="水分检测费" v-model="form1.resultInspectionFees"></el-input>
           </el-form-item>
-          <el-form-item label="计划日期">
+          <!-- <el-form-item label="计划日期">
             <el-date-picker
             v-model="form1.planDate"
             type="datetime"
@@ -30,8 +30,8 @@
             type="datetime"
             placeholder="预计放货日期">
             </el-date-picker>
-          </el-form-item>
-          <el-form-item label="含水率">
+          </el-form-item> -->
+          <el-form-item label="含水率(%)">
              <el-input type="number" placeholder="含水率" v-model="form1.resultMoistureContent"
              @change="pipeiContarct"></el-input>
           </el-form-item>
@@ -164,7 +164,7 @@ export default {
       ) {
         let map = {
           batchInfactoryId: this.form1.batchId,
-          resultMoistureContent: this.form1.resultMoistureContent,
+          resultMoistureContent: this.form1.resultMoistureContent/100,
           resultActualInstallations:this.form1.resultActualInstallations,
         };
         this.axios
@@ -200,8 +200,8 @@ export default {
         ),
         resultIsClear: this.form1.resultIsClear,
         resultOutPortName:this.form1.resultOutPortName,
-        planDate:sjTime(this.form1.planDate),
-        planDeliveryDate:sjTime(this.form1.planDeliveryDate),
+        // planDate:sjTime(this.form1.planDate),
+        // planDeliveryDate:sjTime(this.form1.planDeliveryDate),
         isNeedAssemble:this.form1.isNeedAssemble,
         resultInspectionFees:this.form1.resultInspectionFees,
         moistureTonnage:this.form1.moistureTonnage,

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

@@ -14,7 +14,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="全部" name="first">
         <mergeRowTable v-bind.sync="option1" ref="excelDom" @func="calculate">
-        <el-table-column fixed="right" label="操作" width="50">
+        <el-table-column fixed="right" label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               @click="click(scope.row.resultId)"
@@ -23,18 +23,19 @@
               :disabled="scope.row.isEdit!=1"
               >修改</el-button
             >
-            <!-- <el-button
+            <el-button
             type="text"
             size="small"
+            :disabled="scope.row.isEdit!=1"
             @click="deleteclick(scope.row.resultId)"
-            >删除</el-button > -->
+            >删除</el-button >
           </template>
         </el-table-column>
       </mergeRowTable>
       </el-tab-pane>
       <el-tab-pane label="待计量" name="second">
         <mergeRowTable v-bind.sync="option1" ref="excelDom" @func="calculate">
-        <el-table-column fixed="right" label="操作" width="50">
+        <el-table-column fixed="right" label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               @click="click(scope.row.resultId)"
@@ -43,11 +44,12 @@
               :disabled="scope.row.isEdit!=1"
               >修改</el-button
             >
-            <!-- <el-button
+            <el-button
             type="text"
             size="small"
+            :disabled="scope.row.isEdit!=1"
             @click="deleteclick(scope.row.resultId)"
-            >删除</el-button > -->
+            >删除</el-button >
           </template>
         </el-table-column>
       </mergeRowTable>
@@ -124,6 +126,31 @@ export default {
     click(resultId) {
       this.$router.push("/editOutBoundWagon/" + resultId);
     },
+    deleteclick(resultId){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+          this.axios
+            .post( "/api/v1/tms/deleteOutBoundWagonById?resultId=" + resultId)
+            .then(() => {
+              this.onclick();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!"
+          });
+        });
+    },
     //起止时间校验
     checkSEDate(){
       if(this.startTime && this.endTime && this.startTime<=this.endTime){

src/views/TMS/router/index.js

@@ -1476,7 +1476,10 @@ const constantRouterMap = [
       },{
         path: "threeSectionFeeDetails",
         name: "threeSectionFeeDetails",
-        meta: { code: "xtpzgl-jggl" },
+        meta: { 
+          code: "xtpzgl-jggl",
+          keepAlive: true // 需要被缓存
+        },
         component: threeSectionFeeDetails
       },
       {

src/views/appoint/components/inward/updateTransPrice.vue

@@ -11,7 +11,7 @@
         <el-form :model="obj" :rules="batchFormRules" label-width="100px" label-position="left">
           <div class="preview-group">
             <el-form-item label="运价" prop="priceValue">
-              <el-input v-model="obj.priceValue" placeholder="请输入内容"></el-input>
+              <el-input v-model="obj.priceValue" placeholder="请输入内容" type="number"></el-input>
             </el-form-item>
             <el-form-item label="货物名称" prop="materialNames">
               <el-input v-model="obj.materialNames" readonly></el-input>
@@ -71,6 +71,7 @@ export default {
         this.$message.info("修改前请填写运价！")
           return;
       }
+
       let paramsList = {
         priceId: this.obj.priceId,
         priceValue: this.obj.priceValue,

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

@@ -70,9 +70,11 @@ export default {
       this.loading = true;
       this.isKuang = true;
       if(this.input){
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&con=" +this.input;
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&con=" +this.input+"&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }else{
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&i="+new Date();
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }
     },
     btnclick() {

src/views/appoint/router/index.js

@@ -70,6 +70,7 @@ import saleOrderOODetails from "../components/saleContract/saleOrderOODetails.vu
 import updateSaleOrderSteel from "../components/saleContract/updateSaleOrderSteel.vue";
 import copySteelOrder from "../components/saleContract/copySteelOrder.vue";
 import rangeValuePoint from "../components/inward/rangePoint.vue";
+import updateTransPrice from "../components/inward/updateTransPrice.vue";
 Vue.use(Router);
 
 const constantRouterMap = [
@@ -475,6 +476,12 @@ const constantRouterMap = [
         name: "rangeValuePoint",
         meta: { code: "xtpzgl-yhgl" },
         component: rangeValuePoint
+      },
+      {
+        path: "updateTransPrice",
+        name: "updateTransPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateTransPrice
       }
     ]
   }

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -242,6 +242,19 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <el-tab-pane label="仓库排队列表" name="third">
+          <el-table
+            :data="tableData3"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column prop="warehouseName" label="仓库" fit></el-table-column>
+            <el-table-column prop="carQueue" label="排队车辆"></el-table-column>
+          </el-table>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -267,6 +280,7 @@ export default {
       activeName: "first",
       tableData: [],
       tableData1: [],
+      tableData3: [],
       //存放每一行记录的合并数
       spanArr: [],
       maplist: [],
@@ -490,8 +504,10 @@ export default {
       this.i = 0;
       if (this.activeName == "first") {
         this.getNoSpellingArray();
-      } else {
+      } else if(this.activeName == "second") {
         this.getSpellingArray();
+      } else {
+        this.getStoreArray();
       }
     },
     getNoSpellingArray() {
@@ -514,6 +530,16 @@ export default {
           this.getSpanArr(this.tableData);
         });
     },
+    getStoreArray() {
+      this.axios
+        .post(
+          "/api/v1/qms/getStoreQueueList"
+        )
+        .then(res => {
+          this.tableData3 = res.data.data;
+          console.log("getStoreArray "+this.tableData3);
+        });
+    },
     onclick() {
       if (this.activeName == "first") {
         this.axios

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

@@ -58,6 +58,19 @@
           >查询</el-button
         >
       </div>
+      <div class="in_transit_information2">
+        <span class="item_details">查询地址:</span>
+        <el-input
+          style="width: 300px;"
+          class="inputStyle"
+          v-model.trim="address"
+          clearable
+        >
+        </el-input>
+         <el-button type="primary" class="searchstyle" @click="initLocation"
+          >查询</el-button
+        >
+      </div>
       <div class="driving_information">
         <span class="item_details2">时间:{{ runRoute.gtm }}</span>
         <br />
@@ -178,6 +191,7 @@ export default {
   },
   data() {
     return {
+      address:null,
       //一、 查询相关
       //选择时间区间
       time: [],
@@ -476,6 +490,27 @@ export default {
         }
       });
     },
+    //查询地址并画点
+    initLocation(){
+      console.log("address:",this.address);
+      if(this.address && this.address!=""){
+        this.axios.get("/api/v1/otms/getLocationForAddress?address="+this.address).then((res)=>{
+        console.log("res:",res);
+        if(res.data.code=="0"){
+          //画点
+          this.initMap2([res.data.data.lon,res.data.data.lat],res.data.data.title,res.data.data.address);
+        }else{
+          this.$message({
+            message:res.data.data,
+            type:"warning",
+            offset:100,
+            showClose:true
+          });
+        }
+      });
+      }
+      
+    },
     //初始化数据
     initData() {
       let that = this;
@@ -483,7 +518,7 @@ export default {
       if (that.carNumber == "") {
         this.$message({
           message:"车牌号不能为空！",
-          offset:40,
+          offset:100,
           type:"warning",
           showClose:true
         });
@@ -520,7 +555,7 @@ export default {
           } else {
             this.$message({
               message:"车辆没有开启GPS或尚未注册！",
-              offset:40,
+              offset:100,
               type:"warning",
               showClose:true
             });
@@ -548,6 +583,37 @@ export default {
         that.initEndline();
       });
     },
+    initMap2(lonlat,title,address){
+      lazyAMapApiLoaderInstance.load().then(() => {
+        let that = this;
+        if(!that.map){
+           that.map = new AMap.Map("amap-container", {
+            //设置地图容器id
+            viewMode: "2D", //是否为2D地图模式
+            zoom: 10, //初始化地图级别
+            center: lonlat //初始化地图中心点位置
+          });
+          //初始化
+          that.initGeocoder();
+        }
+        that.initMarkes( 20,25, require("@/assets/img/end.png"),lonlat[0],lonlat[1],title);
+        //自定义窗体内容
+        let content = [
+          "<div  style='top:1px;width: 200px; background-color:  rgba(22, 160, 133, 1);' ><font color='white'>位置："+
+          address
+          +"</font>",
+          "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>名称：" +
+            title +
+            "</font></div></div>"
+        ];
+        // 创建 infoWindow 实例
+        infoWindow = new AMap.InfoWindow({
+          content: content.join("<br>") //传入 dom 对象，或者 html 字符串
+        });
+        // 打开信息窗体
+        infoWindow.open(that.map, lonlat);
+        });
+    },
     //结束点
     initEndline() {
       let that = this;

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

@@ -1,5 +1,17 @@
 <template>
   <div class="tableAllDate">
+    <div class="button-box">
+      <el-button
+        type="primary"
+        v-print="'#pdfDom1'"
+        @click="backScan()"
+        style="width: 500px;height: 120px;font-size: 100px"
+      >
+        <!--class="el-icon-printer"-->
+        <!---->
+        打印
+      </el-button>
+    </div>
     <div id="pdfDom1">
       <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
         <div class="blank"></div>
@@ -190,14 +202,9 @@
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
-    <div class="button-box">
-      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()">
-        <i class="el-icon-printer"></i>打印
-      </el-button>
-      <el-button type="primary" @click="backScan()">
-        <i class="el-icon-back"></i>返回
-      </el-button>
-    </div>
+    <el-button type="primary" @click="backScan()">
+      <i class="el-icon-back"></i>返回
+    </el-button>
   </div>
 </template>
 
@@ -278,7 +285,7 @@ export default {
         });
     },
     backScan() {
-      this.$router.go(-2);
+      this.$router.go(-1);
     }
   }
 };

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

@@ -70,7 +70,7 @@ export default {
           this.orderNumber.startsWith("wysdd") == true
         ) {
           this.$router.push({
-            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+            path: "/printReceipt?orderNumber=" + this.orderNumber
           });
         }
       } else if (this.orderNumber.length > 21) {

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

@@ -478,12 +478,14 @@ export default {
     },
     //运输单价模态框单选选中的事件
     currentRadioChange2(val) {
+      console.log(val);
       //若具体地址有值，清空值
       if (this.place != null) {
         this.place = null;
       }
       (this.address = val.address), (this.addressId = val.addressId);
 
+      this.priceId=val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
     },
@@ -520,7 +522,14 @@ export default {
                     this.$message.success("修改详单单价成功!");
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
-                      "/api/v1/bms/getUnFinishedTruckDetailsOrderList?apiId=176&orderType=1&i=" +
+                      "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+                      this.input +
+                      "&startTime=" +
+                      startTime +
+                      "&endTime=" +
+                      endTime +
+                      "&status=0" +
+                      "&i=" +
                       new Date();
                   } else {
                     this.$message.error("修改详单单价失败,请联系管理员!");