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

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

@@ -50,13 +50,12 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLoadShipList?apiId=512",
+        requestUrl: null,
       },
     };
   },
   mounted() {
     this.initDate();
-    this.onclick();
   },
   methods: {
     initDate(){
@@ -66,6 +65,7 @@ export default {
       this.startTime.setHours(0);
       this.startTime.setMinutes(0);
       this.startTime.setSeconds(0);
+      this.onclick();
     },
     onclick() {
       let startTime = null;

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -363,7 +363,7 @@ export default {
               "&i" +
               new Date() +
               "&isPage=yes" +
-              "&orgCode=" +
+              "&userId=" +
               orgCode
           )
           .then(res => {
@@ -393,7 +393,7 @@ export default {
               capacityNo +
               "&i" +
               new Date() +
-              "&orgCode=" +
+              "&userId=" +
               orgCode +
               "&isPage=yes"
           )
@@ -555,7 +555,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
       if (this.activeName == "second") {
@@ -575,7 +575,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
       if (this.activeName == "third") {
@@ -595,7 +595,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
     },

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -71,7 +71,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="500px"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
         :summary-method="getSummaries"
@@ -250,6 +250,7 @@
           <template slot-scope="scope">
             <el-input
               v-model.number="scope.row.wagonBillWeight"
+              @change="mergeChange(scope.row)"
               placeholder="计费吨位"
             >
             </el-input>
@@ -284,7 +285,7 @@
           width="150px"
         >
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150px">
+        <el-table-column label="操作" align="center" width="150px" prop="operation">
           <template slot-scope="scope">
             <el-button type="text" @click="operate(scope.row)">保存</el-button>
           </template>
@@ -334,7 +335,7 @@ export default {
       operateName: "编辑",
       unloadPointList: [],
       spanArr: [],
-      mergeList: [""]
+      mergeList: ["wagonNo","wagonBillWeight","OutStation"]
     };
   },
   created() {
@@ -425,6 +426,13 @@ export default {
         );
       };
     },
+    //修改合并行同步
+    mergeChange(row){
+      let index=this.tableData.indexOf(row);
+      for(let i=index;i<this.tableData.length && row.wagonNo==this.tableData[i].wagonNo && row.OutStation==this.tableData[i].OutStation;i++){
+        this.tableData[i].wagonBillWeight=row.wagonBillWeight;
+      }
+    },
     operate(row) {
       row.personnelSsoId = getCookie("userId");
       if (
@@ -500,7 +508,7 @@ export default {
         .then(res => {
           this.tableData = res.data.data;
           this.showSummariesPosition();
-          this.getSpanArr();
+          this.getSpanArr(this.tableData);
         });
     },
     //获取后台数据
@@ -513,7 +521,7 @@ export default {
         .then(res => {
           console.log(res.data.data);
           this.tableData = res.data.data;
-          this.getSpanArr();
+          this.getSpanArr(this.tableData);
           this.showSummariesPosition();
         });
     },
@@ -585,7 +593,8 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].trainOrderId === data[i - 1].trainOrderId) {
+          if (data[i].wagonNo === data[i - 1].wagonNo
+          && data[i].OutStation === data[i - 1].OutStation) {
             this.spanArr[this.pos] += 1;
             data[i].group = data[i - 1].group;
             this.spanArr.push(0);

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

@@ -0,0 +1,65 @@
+<template>
+  <!-- 新增装船作业 -->
+  <div style="width:100%">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+        <el-form-item style="display:inline" label="未轧规格">
+            <el-select filterable  v-model="spectionsModel">
+                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">新增</el-button>
+    </el-form>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return{
+        models:[],
+        spectionsModel:null,
+    };
+  },
+  mounted() {
+    this.getAllModel();
+  },
+  methods: {
+    getAllModel(){
+      this.axios
+            .get("/api/v1/qms/getAllModel")
+            .then((res) => {
+                this.models=res.data.data;
+        });
+    },
+    // 新增
+    makeSure() {
+        if(!this.spectionsModel || this.spectionsModel==''){
+          this.$message.warning("请输入正确的规格！");
+          return;
+        }
+        let map={
+            spectionsModel:this.spectionsModel
+        }
+        console.log(map);
+        this.axios
+            .post("/api/v1/qms/addModel",map)
+            .then((res) => {
+              if(res.data.code=="200"){
+                this.$message.success("新增成功!");
+                this.$router.go(-1);
+              }else{
+                this.$message.success("新增失败!");
+              }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,74 @@
+<template>
+  <!-- 新增装船作业 -->
+  <div style="width:100%">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+        <el-form-item style="display:inline" label="未轧规格">
+            <el-select filterable  v-model="spectionsModel">
+                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">修改</el-button>
+    </el-form>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return{
+        models:[],
+        resultId:null,
+        spectionsModel:null,
+    };
+  },
+  mounted() {
+    this.initial();
+    this.getAllModel();
+  },
+  methods: {
+    initial(){
+        console.log("resultId："+this.$route.params.resultId);
+        console.log("spectionsModel："+this.$route.params.spectionsModel);
+        this.resultId=this.$route.params.resultId;
+        this.spectionsModel=this.$route.params.spectionsModel;
+    },
+    getAllModel(){
+      this.axios
+            .get("/api/v1/qms/getAllModel")
+            .then((res) => {
+                this.models=res.data.data;
+        });
+    },
+    // 新增
+    makeSure() {
+        if(!this.spectionsModel || this.spectionsModel==''){
+          this.$message.warning("请输入正确的规格！");
+          return;
+        }
+        let map={
+            resultId:this.resultId,
+            spectionsModel:this.spectionsModel
+        }
+        console.log(map);
+        this.axios
+            .post("/api/v1/qms/updateModel",map)
+            .then((res) => {
+                if(res.data.code=="200"){
+                this.$message.success("修改成功!");
+                this.$router.go(-1);
+              }else{
+                this.$message.success("修改失败!");
+              }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,161 @@
+<template>
+  <!-- 未轧规格 -->
+  <div class="ModelUnrolled" style="width:100%;">
+    <div style="height:100%;width:100%">
+      <div class="search" style="display:flex;margin: 10px;">
+        <el-input
+          placeholder="请输入"
+          v-model="map.input"
+          style="margin: 10px; width:10%"
+          clearable
+        ></el-input>
+        <!-- <el-date-picker style="margin: 10px;" v-model="map.startTime" type="datetime" placeholder="起始日期"></el-date-picker>
+       <el-date-picker style="margin: 10px;" v-model="map.endTime" type="datetime" placeholder="结束日期"></el-date-picker> -->
+        <el-button
+          type="primary"
+          class="btn"
+          @click="search"
+          style="margin: 10px;"
+        >
+          <i class="el-icon-search"></i>查询
+        </el-button>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="addclick()"
+          style="margin: 10px;"
+        >
+          <i class="el-icon-plus"></i>新增
+        </el-button>
+      </div>
+
+      <div  style="height:500px;float:left;margin-left:5px;width:100%">
+        <div  style="height:500px;overflow:scroll;width:100%">
+             <el-table
+          highlight-current-row
+          border
+          fit
+          :data="loadTable"
+          :row-style="{height:'40px'}"
+          style="width: 100%;font-size: 18px">
+          <el-table-column
+          align="center"
+            prop="spectionsModel"
+            label="未轧规格">
+          </el-table-column>
+           <el-table-column fixed="right" label="操作" width="180">
+              <template slot-scope="scope">
+                <el-button type="text" size="mini" @click="updateclick(scope.row)">
+                  修改
+                </el-button>
+                <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+        </el-table>
+        </div >
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
+import FileSaver from "file-saver";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+        count:0,
+        loadTable:[],
+        unLoadTable:[],
+        map:{
+            input:"",
+            startTime:null,
+            endTime:null
+        },
+        spanArr: [], // 用于存放需要合并的行的个数
+        spanIndex: 0, // 记录spanArr数组的下标
+      
+    };
+  },
+  mounted(){
+    this.search();
+  },
+  methods: {
+    //查询装车数据
+    search(){
+      //时间校验
+    //   if(this.map.startTime && this.map.endTime){
+    //     if(this.map.startTime>=this.map.endTime){
+    //         this.$message({
+    //             message:"结束日期必须大于起始日期!",
+    //             type:"warning",
+    //             duration:2000
+    //         });
+    //         return;
+    //     }
+    //     this.map.startTime=sjTime(this.map.startTime);
+    //     this.map.endTime=sjTime(this.map.endTime);
+    //   }else if((this.map.startTime && !this.map.endTime) || (!this.map.startTime && this.map.endTime)){
+    //     this.$message({
+    //         message:"起止日期错误!",
+    //         type:"warning",
+    //         duration:2000
+    //     });
+    //     return;
+    //   }
+      this.axios.get('/api/v1/qms/getAllModelUnrolled?index='+this.map.input).then((res)=>{
+        if(res.data.code == "200"){
+          this.loadTable=res.data.data;
+        }else {
+          this.$message({
+              type: "error", 
+              message: res.data.data,
+          });
+        }
+      })
+    },
+    updateclick(row) {
+      console.log(row);
+      this.$router.push("/editModel/" + row.resultId+"/"+row.spectionsModel);
+    },
+    addclick() {
+      this.$router.push("/addModel");
+    },
+    deleteclick(resultId) {
+        console.log(resultId);
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios.post("/api/v1/qms/deleteModel",{
+            resultId:resultId
+          }).then(() => {
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+            this.search();
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+
+</style>
+

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

@@ -116,15 +116,17 @@
             @selection-change="handleSelectionChange"
             max-height="600px"
           >
+          <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
               type="selection"
               width="55"
-              :selectable="selectInit"
               reserve-selection
             ></el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
+            <el-table-column prop="resultStartTime" label="排队开始时间">
+            </el-table-column>
             <el-table-column prop="consigneeName" label="客户" fit>
             </el-table-column>
             <el-table-column prop="materialName" label="物资名称">
@@ -149,12 +151,6 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="resultStartTime" label="排队开始时间">
-            </el-table-column>
-            <el-table-column
-              prop="listNodeOrder"
-              label="序号"
-            ></el-table-column>
             <el-table-column prop="driverTel" label="司机电话号码">
             </el-table-column>
             <el-table-column prop="sureTime" label="可进厂确认时间">
@@ -162,6 +158,10 @@
 
             <el-table-column prop="gatepostName" label="进厂门岗">
             </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
             <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
@@ -578,13 +578,14 @@ export default {
           }
         }
       }
-      if (
-        !this.maplist.some(e => {
-          return e.ROW_ID == 1;
-        })
-      ) {
-        this.$refs.mutiData.clearSelection();
-      }
+      //限制只取第一个去掉
+      // if (
+      //   !this.maplist.some(e => {
+      //     return e.ROW_ID == 1;
+      //   })
+      // ) {
+      //   this.$refs.mutiData.clearSelection();
+      // }
     },
     updateBill(scope) {
       console.log(scope.row.capacityId);
@@ -613,6 +614,12 @@ export default {
           this.$message.error("请选择装货点");
           return;
         }
+        let warehouse=this.tableData3.find(value=>value.materialPriority===this.maplist[i].id);
+        console.log("warehouse",warehouse);
+        if(warehouse && warehouse.carQueue >= 10){
+          this.$message.error("该仓库已经有10辆车在排队，不允许放行！");
+          return;
+        }
         this.filterArr(this.maplist[i].resultId);
       }
       var filterArr2 = [];

src/views/queue/router/index.js

@@ -30,6 +30,9 @@ import queueWStart from '../components/qmsWarehouse/queueWStart.vue'
 import queueWTransfer from '../components/qmsWarehouse/queueWTransfer.vue'
 import queueWTruckMonitor from '../components/qmsWarehouse/queueWTruckMonitor.vue'
 import editBill from '../components/qmsEnFacotory/updateBill.vue'
+import model from '../components/qmsEnFacotory/model.vue'
+import addModel from '../components/qmsEnFacotory/addModel.vue'
+import editModel from '../components/qmsEnFacotory/editModel.vue'
 Vue.use(Router)
 const constantRouterMap = [
 	{
@@ -63,7 +66,10 @@ const constantRouterMap = [
 		{path: 'queueWStart', name: 'queueWStart', meta: {code: 'xtpzgl-yhgl'}, component: queueWStart},
 		{path: 'queueWTransfer', name: 'queueWTransfer', meta: {code: 'xtpzgl-yhgl'}, component: queueWTransfer},
 		{path: 'queueWTruckMonitor', name: 'queueWTruckMonitor', meta: {code: 'xtpzgl-yhgl'}, component: queueWTruckMonitor},
-		{path:'editBill/:capacityId/:capacityNumber',name:'editBill', meta: {code: 'xtpzgl-yhgl'}, component: editBill}
+		{path:'editBill/:capacityId/:capacityNumber',name:'editBill', meta: {code: 'xtpzgl-yhgl'}, component: editBill},
+		{path: 'model', name: 'model', meta: {code: 'xtpzgl-yhgl'}, component: model},
+		{path: 'addModel', name: 'addModel', meta: {code: 'xtpzgl-yhgl'}, component: addModel},
+		{path:'editModel/:resultId/:spectionsModel',name:'editModel', meta: {code: 'xtpzgl-yhgl'}, component: editModel}
 	]
 	}
   ];

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

@@ -1,7 +1,7 @@
 //钢材统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <el-form :inline="true" style="margin-top :5px">
+    <el-form :inline="true" style="margin-top :5px;margin-left:30px">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
           >计毛时间：</label
@@ -33,6 +33,8 @@
           <i class="el-icon-refresh"></i>刷新
         </el-button>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" style="margin-top :5px;margin-left:10px">
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计净重：</span>
         <el-input
@@ -70,7 +72,7 @@ export default {
       option: {
         requestUrl: "",
         comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 13, 14, 15, 16, 19, 24, 25, 26]
+        columnIndexs: [0, 1, 2,12,13,14,17,21,22,23,24,25,26,27]
       },
       startTime: null,
       endTime: null,
@@ -85,13 +87,13 @@ export default {
     //初始化表头
     if (getCookie("orgCode") == "chengyunshang") {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        "/api/v1/tms/getAllSaleReport?apiId=514&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
         getCookie("userId") +
         "&i=" +
         new Date();
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        "/api/v1/tms/getAllSaleReport?apiId=514&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
         null +
         "&i=" +
         new Date();
@@ -130,7 +132,7 @@ export default {
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            "/api/v1/tms/getAllSaleReport?apiId=514&startTime=" +
             startTime +
             "&endTime=" +
             endTime +
@@ -141,7 +143,7 @@ export default {
             new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            "/api/v1/tms/getAllSaleReport?apiId=514&startTime=" +
             startTime +
             "&endTime=" +
             endTime +
@@ -160,7 +162,7 @@ export default {
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            "/api/v1/tms/getAllSaleReport?apiId=514&startTime=" +
             startTime +
             "&endTime=" +
             endTime +
@@ -171,7 +173,7 @@ export default {
             new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            "/api/v1/tms/getAllSaleReport?apiId=514&startTime=" +
             startTime +
             "&endTime=" +
             endTime +