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

build/utils.js

@@ -19,6 +19,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
+// let devModules = ["index", "inward", "WMS", "queue"];
 let devModules = ["all"];
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 

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/WMS/components/steel/bar1_steel/bar1_steel_inbound.vue

@@ -68,7 +68,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 1
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

src/views/WMS/components/steel/bar2_steel/bar2_steel_inbound.vue

@@ -60,7 +60,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 2
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

src/views/WMS/components/steel/steel_inbound.vue

@@ -66,7 +66,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 3
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

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/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -620,6 +620,7 @@ export default {
     updateCapacity(row) {
       row.isIwardSteel = 4;
       row.saleOrderMaterialId = row.saleOrderId;
+      row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;

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

@@ -162,8 +162,15 @@
 
             <el-table-column prop="gatepostName" label="进厂门岗">
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="100">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="ctrlZQueueAllow(scope)"
+                >
+                  撤销放行
+                </el-button>
                 <el-button type="text" size="mini" @click="updateBill(scope)">
                   修改提货单
                 </el-button>
@@ -220,8 +227,15 @@
             <el-table-column prop="sureTime" label="可进厂确认时间">
             </el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="100">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="ctrlZQueueAllow(scope)"
+                >
+                  撤销放行
+                </el-button>
                 <el-button type="text" size="mini" @click="updateBill(scope)">
                   修改提货单
                 </el-button>
@@ -229,6 +243,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>
@@ -254,6 +281,7 @@ export default {
       activeName: "first",
       tableData: [],
       tableData1: [],
+      tableData3: [],
       //存放每一行记录的合并数
       spanArr: [],
       maplist: [],
@@ -303,6 +331,22 @@ export default {
     }
   },
   methods: {
+    ctrlZQueueAllow(scope) {
+      let map = {
+        listId: scope.row.listId,
+        resultTotalId: scope.row.resultTotalId
+      };
+      console.log(map);
+      this.axios.post("/api/v1/qms/ctrlZQueueAllow", map).then(res => {
+        if (res.data.code == 200) {
+          this.$message.success("撤销成功");
+          this.getNoSpellingArray();
+          this.getSpellingArray();
+        } else {
+          this.$message.error("撤单失败");
+        }
+      });
+    },
     wantEnfactory() {
       this.axios.get("/api/v1/uc/getQueueCount").then(res => {
         this.totalQueueNum = res.data.data;
@@ -461,8 +505,10 @@ export default {
       this.i = 0;
       if (this.activeName == "first") {
         this.getNoSpellingArray();
-      } else {
+      } else if(this.activeName == "second") {
         this.getSpellingArray();
+      } else {
+        this.getStoreArray();
       }
     },
     getNoSpellingArray() {
@@ -485,6 +531,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,8 +1,12 @@
 <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">
+      <el-button
+        type="primary"
+        v-print="'#pdfDom1'"
+        @click="backScan()"
+        style="width: 500px;height: 120px;font-size: 100px"
+      >
         <!--class="el-icon-printer"-->
         <!---->
         打印
@@ -202,7 +206,6 @@
       <i class="el-icon-back"></i>返回
     </el-button>
   </div>
-
 </template>
 
 <script>
@@ -241,7 +244,7 @@ export default {
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       note: "",
-      dataList:['1','2','3']
+      dataList: ["1", "2", "3"]
     };
   },
   created() {

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

@@ -293,7 +293,7 @@
         <el-table-column prop="closeEntryId" label="金蝶分录ID" width="100px">
         </el-table-column>
         <el-table-column
-          label="操作"
+          label="分录操作"
           fixed="right"
           width="120px"
           align="center"
@@ -317,7 +317,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="操作"
+          label="整车操作"
           fixed="right"
           width="80px"
           align="center"
@@ -477,6 +477,24 @@ export default {
         27,
         29
       ],
+      mergeList: [
+        "序号",
+        "整车操作",
+        "销售订单状态",
+        "销售订单号",
+        "发货单位",
+        "司机电话",
+        "运输订单号",
+        "签收地址",
+        "抵达地址",
+        "出厂时间",
+        "进厂时间",
+        "运单状态",
+        "车牌号",
+        "承运商",
+        "下单客户",
+        "收货地址"
+      ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
       lineSpelling: [
@@ -1070,7 +1088,7 @@ export default {
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (this.columnIndexs.indexOf(columnIndex) != -1) {
+      if (this.mergeList.indexOf(column.label) != -1) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {