Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/appoint/components/inward/updateTransPrice.vue

build/utils.js

@@ -20,7 +20,10 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
+// let devModules = ["index", "appoint", "statisticalReport", "sale"];
 let devModules = ["all"];
+//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport',"inward"];
+
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 
 if (pathSrc.indexOf("node_modules") > -1) {

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    //target: "http://localhost:8080",
+    // target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

package.json

@@ -46,7 +46,7 @@
     "sass-loader": "^6.0.7",
     "sass-node": "^4.11.2",
     "sass-resources-loader": "^2.2.4",
-    "screenfull": "^5.1.0",
+    "screenfull": "^5.2.0",
     "script-loader": "^0.7.2",
     "socket.io": "^2.2.0",
     "socket.io-stream": "^0.9.1",
@@ -90,6 +90,7 @@
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^2.0.1",
+    "codemirror": "5.65.5",
     "compression-webpack-plugin": "^6.0.2",
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -148,8 +149,7 @@
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0",
-    "webpack-node-externals": "^1.7.2",
-    "codemirror": "5.65.5"
+    "webpack-node-externals": "^1.7.2"
   },
   "engines": {
     "node": ">= 6.0.0",

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -9,6 +9,7 @@
       :border="border"
       :cell-class-name="cellClassName"
       :height="height"
+      :max-height="maxHeight"
       :highlight-current-row="highlightCurrentRow"
       style="width:100%"
       :span-method="objectSpanMethod"
@@ -185,7 +186,7 @@ export default {
     // Table 的最大高度。合法的值为数字或者单位为 px 的高度。
     //sdada
     maxHeight: {
-      default: null
+      default: "500px"
     },
     // 是否启用排序
     sortable: {

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/WMS/components/billingOrder/orderDetails.vue

@@ -31,6 +31,8 @@
             style="width:200px"
           >
           </el-date-picker>
+        </el-form-item>
+        <el-form-item>
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
@@ -50,7 +52,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="650px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -59,7 +61,6 @@
           width="50"
           label="序号"
           align="center"
-          fixed="left"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
@@ -69,8 +70,7 @@
           column-key="capacityNo"
           label="车牌号"
           align="center"
-          width="250px"
-          fixed
+          width="150px"
         >
         </el-table-column>
         <el-table-column
@@ -90,7 +90,7 @@
           prop="materialNumber"
           label="物资件数"
           align="center"
-          width="200px"
+          width="150px"
         >
           <template slot-scope="scope">
             <button
@@ -158,15 +158,21 @@
         <el-table-column
           label="操作"
           fixed="right"
-          width="120px"
+          width="220px"
           align="center"
         >
           <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.numberOfFurnaces"
+              v-if="!scope.row.materialName.includes('乱尺')"
+              placeholder="炉号1-件数/炉号2-件数"
+              style="width:180px"
+            >
+            </el-input>
             <el-button
               type="text"
               size="small"
               @click="disorderlyOutbound(scope.row)"
-              :disabled="!scope.row.materialName.includes('乱尺')"
               >出库申请</el-button
             >
           </template>
@@ -275,6 +281,7 @@ export default {
       let updateMap = {
         orderId: row.orderId,
         saleOrderMaterialId: row.saleOrderMaterialId,
+        saleOrderId: row.saleOrderId,
         mapList: arr
       };
       this.axios
@@ -298,6 +305,7 @@ export default {
     },
     //查询，输入查询条件
     onclick() {
+      console.log("我点击实践");
       let startTime = null;
       let endTime = null;
       let capacityNo = null;
@@ -307,12 +315,10 @@ export default {
       }
       this.axios
         .post(
-          "/api/v1/tms/getSaleSteelReport?startTime=" +
+          "/api/v1/oms/getWarehouseMes?startTime=" +
             startTime +
             "&endTime=" +
             endTime +
-            "&carrierSsoId=" +
-            carrierSsoId +
             "&i=" +
             new Date() +
             "&capacityNo=" +
@@ -346,10 +352,17 @@ export default {
     },
     disorderlyOutbound(row) {
       console.log(row);
+      this.$set(row, "input", "true");
+      if (!row.materialName.includes("乱尺") && !row.numberOfFurnaces) {
+        this.$message.error("请先输入炉号");
+        return;
+      }
+      console.log(row.numberOfFurnaces);
       if (row.warehouseId == null) {
         this.$message.error("请先选择装货点");
         return;
       }
+      //对炉号解码判断格式件数是否输入准确
       row.userId = getCookie("userId");
       let title = `确定对${row.capacityNumber}的${row.materialNumber}${row.materialName}出库吗?`;
       this.$confirm(title, "提醒", {
@@ -375,6 +388,11 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 30px;
+      background-color: transparent;
+    }
   }
   .address {
     .button-box {

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

@@ -1058,8 +1058,9 @@ export default {
       let day = new Date().getDate();
       let month = new Date().getMonth() + 1;
       console.log(day);
-      console.log(month);
-      console.log(`${month}.${day}`);
+      if (day < 10) {
+        day = "0" + day;
+      }
       return `${month}.${day}`;
     },
     handleSelectSaleArea(item) {

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

@@ -169,7 +169,9 @@
 
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure" :loading="loading">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="loading"
+        >确定</el-button
+      >
     </div>
   </div>
 </template>
@@ -188,7 +190,7 @@ export default {
       pos: 0,
       //加载
       selectLineLoading: false,
-      loading:false,
+      loading: false,
       //所有选中承运商Id和承运商名称暂存
       carrierIdAndName: [],
       //承运商下拉框中的值
@@ -523,8 +525,7 @@ export default {
     },
     //点击确定按钮的事件
     makeSure() {
-      this.loading=true;
-      return;
+      this.loading = true;
       if (this.canSend == -1) {
         this.$message.warning("电话号码格式不正确,请输入正确的电话号码!");
       } else {
@@ -575,7 +576,7 @@ export default {
                 } else {
                   this.$message.error("派单失败:" + res.data.data);
                 }
-                this.loading=false;
+                this.loading = false;
               });
           })
           .catch(() => {

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

@@ -139,7 +139,7 @@
       </el-form-item>
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
-        >可装货时间</label
+          >可装货时间</label
         >
         <el-date-picker
           class="textinput3"
@@ -183,7 +183,7 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
-                  :id="'input'+scope.$index"
+                  :id="'input' + scope.$index"
                   @keyup.up.native="clicks(scope.$index)"
                   @keyup.down.native="clickx(scope.$index)"
                   @keyup.enter.native="createACar"
@@ -313,10 +313,12 @@
                 >
                 </el-input>
                 <!--更改-->
-                <i class="el-icon-edit"
-                   @click="changeMaterial(scope.$index)"
-                   style="font-size: 20px"
-                   v-if="isCellClick == 1"></i>
+                <i
+                  class="el-icon-edit"
+                  @click="changeMaterial(scope.$index)"
+                  style="font-size: 20px"
+                  v-if="isCellClick == 1"
+                ></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -326,7 +328,7 @@
                 ></el-input>
               </template>
               <!--规格型号-->
-              <template v-if="item.prop=='Specification'">
+              <template v-if="item.prop == 'Specification'">
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.Specification"
@@ -370,10 +372,11 @@
                 >
                 </el-input>
                 <!--增加-->
-                <i class="el-icon-folder-add"
-                   @click="ondrawer(scope.row, scope.$index)"
-                   v-if="isCellClick == 1"
-                   style="font-size: 20px"
+                <i
+                  class="el-icon-folder-add"
+                  @click="ondrawer(scope.row, scope.$index)"
+                  v-if="isCellClick == 1"
+                  style="font-size: 20px"
                 ></i>
               </template>
               <!-- 收货客户电话号码 -->
@@ -400,8 +403,12 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200"
-                         v-if="isCellClick == 1">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="200"
+          v-if="isCellClick == 1"
+        >
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -717,7 +724,7 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140",
+          width: "140"
         },
         {
           prop: "orderPlanWeight",
@@ -826,6 +833,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -913,7 +928,7 @@ export default {
       //是否忽视收货客户电话字段
       ignoreSaleOrderConsigneeTel: 0,
       //暂时存取的数据
-      temporarylist: [],
+      temporarylist: []
     };
   },
   created() {
@@ -1833,15 +1848,15 @@ export default {
     addAddressClick() {
       //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
       //定义一个正则表达式判断是否有电话
-      var est=/\d{11}/g
-      var string2=this.place.match(est)
-      console.log("-----------这是抓取到的数据----------")
-      console.log(string2)
-      if (string2 != null){
-        for(i=0;i<string2.length;i++){
-          var reg=/^1[3456789]\d{9}$/
-          if(reg.test(string2[i])){
-            this.saleOrderConsigneeTel=string2
+      var est = /\d{11}/g;
+      var string2 = this.place.match(est);
+      console.log("-----------这是抓取到的数据----------");
+      console.log(string2);
+      if (string2 != null) {
+        for (i = 0; i < string2.length; i++) {
+          var reg = /^1[3456789]\d{9}$/;
+          if (reg.test(string2[i])) {
+            this.saleOrderConsigneeTel = string2;
           }
         }
       }
@@ -1914,17 +1929,17 @@ export default {
           i++;
         }
       });
-      let s=0
+      let s = 0;
       //确认规格型号格式是否正确
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            s=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            s = 1;
           }
-        })
-      console.log("这是获取到的数据")
-      if (s== 1){
+        });
+      console.log("这是获取到的数据");
+      if (s == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -1963,36 +1978,38 @@ export default {
       });
       this.orderMakeSure = true;
     },
-    async getlist(){
-      let res=await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-      this.selectionList=res.data.data
-      console.log("这是查询出来的")
-      console.log(res.data.data)
-      console.log("这是修改后的数据")
-      console.log(this.selectionList)
+    async getlist() {
+      let res = await this.axios.post(
+        "/api/v1/ams/queryMaterial",
+        this.selectionList
+      );
+      this.selectionList = res.data.data;
+      console.log("这是查询出来的");
+      console.log(res.data.data);
+      console.log("这是修改后的数据");
+      console.log(this.selectionList);
     },
     //发送请求
     async sendRequest() {
       //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
       //先把暂存区的数据清空
-      this.temporarylist=[]
-      let flag=0
+      this.temporarylist = [];
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-        .then(res=>{
-          if (res.data.code === "500"){
-            flag=1
+        .post("/api/v1/ams/queryMaterial", this.selectionList)
+        .then(res => {
+          if (res.data.code === "500") {
+            flag = 1;
           }
-          console.log(res.data.code)
+          console.log(res.data.code);
           //给暂存区的数据赋值
-          this.temporarylist=res.data.data
-          console.log("以下是查询出来的数据")
-          console.log(res.data.data)
-        })
-      if (flag===1){
-        this.$message.error("规格型号不对")
-        return
+          this.temporarylist = res.data.data;
+          console.log("以下是查询出来的数据");
+          console.log(res.data.data);
+        });
+      if (flag === 1) {
+        this.$message.error("规格型号不对");
+        return;
       }
       //先调删除订单接口
       this.axios
@@ -2006,9 +2023,9 @@ export default {
             //是否还有件数未填写
             var orderPlanWeightAllFill = 0;
             //初始化maplist
-            this.selectionList=this.temporarylist
-            console.log("以下是修改过后的数据")
-            console.log(this.selectionList)
+            this.selectionList = this.temporarylist;
+            console.log("以下是修改过后的数据");
+            console.log(this.selectionList);
             var mapList = [];
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {
@@ -2089,32 +2106,33 @@ export default {
     },
     CloseClick() {},
     //点击事件（上）
-    clicks(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      console.log('clicks=e',arguments);
-      if (index==0){
-        console.log("向上1")
+    clicks(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      console.log("clicks=e", arguments);
+      if (index == 0) {
+        console.log("向上1");
         //this.datalistindex=this.materialTableTop.length-1
-        document.getElementById("input" + (this.materialList.length-1)).focus()
-      }else {
-        console.log("向上2")
+        document
+          .getElementById("input" + (this.materialList.length - 1))
+          .focus();
+      } else {
+        console.log("向上2");
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
-        document.getElementById("input" + (index-1)).focus()
+        document.getElementById("input" + (index - 1)).focus();
       }
-
     },
     //点击事件(下)
-    clickx(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      if (index ==this.materialList.length-1){
-        console.log("向下1")
-        document.getElementById("input" + 0).focus()
-      }else {
-        console.log("向下2")
+    clickx(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      if (index == this.materialList.length - 1) {
+        console.log("向下1");
+        document.getElementById("input" + 0).focus();
+      } else {
+        console.log("向下2");
         //this.datalistindex+=1
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
         //var tbl=document.getElementById("table").childNodes[0]
@@ -2123,7 +2141,7 @@ export default {
         //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
         //console.log(rowlist)
         var nextInput = document.getElementById("input" + (index + 1));
-        nextInput.focus()
+        nextInput.focus();
       }
     }
   }

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="物资名称">
@@ -138,7 +140,7 @@
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select size="mini" v-model="scope.row.id"
-                @change="changePriority($event,scope.row.id)">
+                @change="changePriority(scope.row)">
                   <el-option
                     v-for="item in option"
                     :key="item.id"
@@ -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
@@ -202,7 +202,8 @@
             </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
-                <el-select size="mini" v-model="scope.row.id">
+                <el-select size="mini" v-model="scope.row.id"
+                           @change="changePriority(scope.row)">
                   <el-option
                     v-for="item in option"
                     :key="item.id"
@@ -578,13 +579,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 +615,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 = [];
@@ -658,9 +666,24 @@ export default {
         }
       });
     },
-    changePriority(value,s){
-      console.log("装货点："+value)
-      console.log("数据第几行:"+s)
+    changePriority(row){
+      console.log("装货点："+row.id);
+      console.log("订单id"+row.orderId);
+      console.log("物资ID"+row.materialId);
+      let map = {
+        id: row.id,
+        orderId: row.orderId,
+        materialId: row.materialId
+      };
+      this.axios.post("/api/v1/qms/modifyLoadWarehouse",map)
+        .then((res)=>{
+          console.log(res)
+          if (res.data.code=="200"){
+            this.$message.success("更新装货点成功")
+          }else {
+            this.$message.error("更新装货点失败")
+          }
+        })
       //this.axios.post("")
     }
   }

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/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -4,37 +4,42 @@
     <el-form :inline="true">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;">时间段</label>
-            <el-date-picker
+        <el-date-picker
           v-model="dateValue"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">产品分类</span>
-          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+        <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">车牌号</span>
-          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+        <span class="el-form-item__span" style="width: auto;">车牌号</span>
+        <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">收货单位</span>
-          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">收货单位</span>
+        <el-input
+          v-model="consigneeCompanyName1"
+          placeholder="请输入内容"
+        ></el-input>
+      </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">承运单位</span>
-          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">承运单位</span>
+        <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">门岗名称</span>
         <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-      
+        <el-button type="primary" @click="onSearch"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
       </el-form-item>
     </el-form>
     <!-- 执行中 -->
@@ -42,21 +47,39 @@
     <mergeRowTable ref="tab" v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="180">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row)" type="text" size="small" style="font-size: 17px">轨迹</el-button>
-          <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">抵达图</el-button>
-          <el-button @click="receipctPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">签收图</el-button>
+          <el-button
+            @click="click(scope.row)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >轨迹</el-button
+          >
+          <el-button
+            @click="toPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >抵达图</el-button
+          >
+          <el-button
+            @click="receipctPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >签收图</el-button
+          >
         </template>
       </el-table-column>
     </mergeRowTable>
 
     <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
-            <template #default>
-              <PathView v-bind.sync="pathOption"></PathView>
-            </template>
+        <template #default>
+          <PathView v-bind.sync="pathOption"></PathView>
+        </template>
       </vxe-modal>
     </div>
-     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center;"
@@ -66,7 +89,7 @@
         </el-image>
       </div>
     </vxe-modal>
-     <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center"
@@ -82,87 +105,85 @@
           <dilTable ref="tableAlarm" v-bind.sync="optionAlarm"></dilTable>
         </template>
       </vxe-modal>
-    </div> 
+    </div>
   </div>
 </template>
 
-
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import PathView from "./mapTest.vue"
+import PathView from "./mapTest.vue";
 export default {
   name: "inTransit",
-  components: { 
-    PathView,
+  components: {
+    PathView
   },
   data() {
     return {
-      dateValue:[new Date(), new Date()],
-      inputValue:"",
-      exceptionType:"全部类型",
-      selectOrderNumber:"",
-      capacityNumber1:"",
-      carrierName:"",
-       gatepostName:"",
-       value7:false,
-       value6:false,
-       value5:false,
-       dialogVisible:false,
-      consigneeCompanyName1:"",
+      dateValue: [new Date(), new Date()],
+      inputValue: "",
+      exceptionType: "全部类型",
+      selectOrderNumber: "",
+      capacityNumber1: "",
+      carrierName: "",
+      gatepostName: "",
+      value7: false,
+      value6: false,
+      value5: false,
+      dialogVisible: false,
+      consigneeCompanyName1: "",
       status: "",
       state: "",
       activeName: "first",
-      option: {       
+      option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/otms/transportationPerformance?apiId=479",
-        comparison:"orderNumber",
-        columnIndexs:[1,2,8,9,10,11,12,13,14,15,16,17,18,19],  
+        comparison: "orderNumber",
+        columnIndexs: [1, 2, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
       },
-      
-      optionAlarm:{
-        requestUrl: "",
+
+      optionAlarm: {
+        requestUrl: ""
       },
-      pathOption:{
-           orderNumber:'',
-        capacityNumber:'',
-         startPointName:'',
-        endPointName:'',
+      pathOption: {
+        orderNumber: "",
+        capacityNumber: "",
+        startPointName: "",
+        endPointName: ""
       },
-      mileOption:{
-        orderNumber:''
+      mileOption: {
+        orderNumber: ""
       },
-      alarmOption:{
-        orderNumber:''
+      alarmOption: {
+        orderNumber: ""
       },
       srcList: [],
       src: "",
-      isShow:false,
+      isShow: false,
       srcList2: [],
       src2: "",
-      isShow2:false,
+      isShow2: false
     };
   },
   mounted() {
-    console.log("nijfdsojfosafj")
+    console.log("nijfdsojfosafj");
     this.restaurants = this.loadAll();
     // this.onSearch();
-    
   },
   methods: {
-    receipctPhotoClick(orderNumber){
-      this.axios
-       .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
-       .then((res)=>{
-         console.log(res.data)
-          this.isShow2=true;
-          this.srcList2=[];
-          this.src2=res.data.resultSignedNotePhoto;
+    receipctPhotoClick(orderNumber) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + orderNumber)
+        .then(res => {
+          console.log(res.data);
+          this.isShow2 = true;
+          this.srcList2 = [];
+          this.src2 = res.data.resultSignedNotePhoto;
           this.srcList2.push(res.data.resultSignedNotePhoto);
-          this.srcList2.push(res.data.resultEmptyContainerPhoto);
-          if(res.data.resultReceiveNotePhoto!=null){
-             this.srcList2.push(res.data.resultReceiveNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
           }
-       });
+        });
     },
     toPhotoClick(orderNumber) {
       this.axios
@@ -174,14 +195,14 @@ export default {
           this.srcList.push(res.data.data);
         });
     },
-   
-    showPathView(data){
-      this.dialogVisible=!this.dialogVisible;
-      this.selectOrderNumber=data.orderNumber;
+
+    showPathView(data) {
+      this.dialogVisible = !this.dialogVisible;
+      this.selectOrderNumber = data.orderNumber;
     },
- 
+
     createFilter(queryString) {
-      return (restaurant) => {
+      return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
           0
@@ -190,45 +211,59 @@ export default {
     },
     loadAll() {
       return [
-        { value: "螺纹钢"},
-         { value: "微粉"},
-        { value: "带钢"},
-        { value: "钢坯"},
-        { value: "其他"},
+        { value: "螺纹钢" },
+        { value: "微粉" },
+        { value: "带钢" },
+        { value: "钢坯" },
+        { value: "其他" }
       ];
     },
-    exportData(){
-        
-        let tHeader = [];
-        let filterVal = [];
-        if(this.activeName=="first"){
-          this.$refs.tab.dataColumnData.filter( (item,i) =>{
-                    tHeader.push(item.label);
-                        filterVal.push(item.prop);
-                    } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab.dataTabel,'执行中表格');
-        }else if(this.activeName=="second"){
-            this.$refs.tab2.dataColumnData.filter( (item,i) =>{
-              tHeader.push(item.label);
-                  filterVal.push(item.prop);
-              } )
-          this.export2Excel(tHeader,filterVal,this.$refs.tab2.dataTabel,'已完成表格');
-        } else if(this.activeName=="third"){
-            this.$refs.tab3.dataColumnData.filter( (item,i) =>{
-                      tHeader.push(item.label);
-                          filterVal.push(item.prop);
-                      } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab3.dataTabel,'有异常表格');
-        }
-        
-        
+    exportData() {
+      let tHeader = [];
+      let filterVal = [];
+      if (this.activeName == "first") {
+        this.$refs.tab.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab.dataTabel,
+          "执行中表格"
+        );
+      } else if (this.activeName == "second") {
+        this.$refs.tab2.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab2.dataTabel,
+          "已完成表格"
+        );
+      } else if (this.activeName == "third") {
+        this.$refs.tab3.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab3.dataTabel,
+          "有异常表格"
+        );
+      }
     },
-    export2Excel(tHeader,filterVal,dataTabel,exeName) {
+    export2Excel(tHeader, filterVal, dataTabel, exeName) {
       var that = this;
-       this.downloadLoading = true
+      this.downloadLoading = true;
       require.ensure([], () => {
-        const { export_json_to_excel } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        console.log("export_json_to_excel",export_json_to_excel)
+        const {
+          export_json_to_excel
+        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        console.log("export_json_to_excel", export_json_to_excel);
         let list = dataTabel;
         let data = that.formatJson(filterVal, list);
         export_json_to_excel(tHeader, data, exeName); // 导出的表格名称
@@ -236,100 +271,106 @@ export default {
     },
     //3.格式转换
     formatJson(filterVal, jsonData) {
-      return jsonData.map((v) => filterVal.map((j) => v[j]));
+      return jsonData.map(v => filterVal.map(j => v[j]));
     },
-    onSearch(){
-  
-      if(this.activeName=="first"){
-      //改变执行中条件
-      console.log(this.$refs.tab)
-      console.log("this.$refs.tab")
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+    onSearch() {
+      if (this.activeName == "first") {
+        //改变执行中条件
+        console.log(this.$refs.tab);
+        console.log("this.$refs.tab");
+        this.$refs.tab.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
+      }
+      if (this.activeName == "second") {
+        //改变已完成条件
+        this.$refs.tab2.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="second"){
-      //改变已完成条件              
-      this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+      if (this.activeName == "third") {
+        //改变有异常条件
+        this.$refs.tab3.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumber1: this.capacityNumber1,
+          carrierName1: this.carrierName,
+          abnormalType:
+            this.exceptionType == "全部类型" ? "" : this.exceptionType,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="third"){
-      //改变有异常条件              
-      this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
-      }                              
     },
 
-
     //other
     click(row) {
-        let that = this;
-        that.axios
-          .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
-          .then(res => {
-            console.log(res.data);
-            if (res.data.data == "-1") {
-              this.$message.error("运输订单未关闭的自提车辆无权查看!");
-            } else if (res.data.data.startAndEndRoutes != null) {
-              that.pathOption.orderNumber=row.orderNumber;
-              that.pathOption.capacityNumber=row.capacityNumber;
-              that.pathOption.startPointName="达钢集团"+row.outGatepostName,
-              that.pathOption.endPointName=row.deliveryAddress,
-              that.value7=true;
-            } else {
-              this.$message.error("车辆没有开启GPS");
-            }
-          });
+      let that = this;
+      that.axios
+        .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
+        .then(res => {
+          console.log(res.data);
+          if (res.data.data == "-1") {
+            this.$message.error("运输订单未关闭的自提车辆无权查看!");
+          } else if (res.data.data.startAndEndRoutes != null) {
+            that.pathOption.orderNumber = row.orderNumber;
+            that.pathOption.capacityNumber = row.capacityNumber;
+            (that.pathOption.startPointName = "达钢集团" + row.outGatepostName),
+              (that.pathOption.endPointName = row.deliveryAddress),
+              (that.value7 = true);
+          } else {
+            this.$message.error("车辆没有开启GPS");
+          }
+        });
     },
-    historyclick(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;
+    historyclick(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;
     },
-    allDistanceclick(orderNumber){
+    allDistanceclick(orderNumber) {
       //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
-    
-      this.mileOption.orderNumber=orderNumber;
-      this.value6=true;
-    },
-    inTransitAlarmclick(orderNumber){
-      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
-      this.value5=true;
-    },
+
+      this.mileOption.orderNumber = orderNumber;
+      this.value6 = true;
     },
+    inTransitAlarmclick(orderNumber) {
+      this.optionAlarm.requestUrl =
+        "/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers=" +
+        orderNumber;
+      this.value5 = true;
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .el-input {
-    width: 150px;
-    margin-left: 5px;
+  width: 150px;
+  margin-left: 5px;
 }
 span.el-form-item__span {
-    float: left;
-    margin-top: 7px;
+  float: left;
+  margin-top: 7px;
 }
 .homeworkPath {
   .top {
     padding: 20px 30px;
   }
 }
-</style>
+</style>

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

@@ -197,6 +197,9 @@
           </tr>
         </table>
       </div>-->
+        <!--设置中间的间隔以及虚线-->
+        <div style="height: 80px"></div>
+        <hr width=1500px style="border:1px dashed black;height:1px">
       </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
@@ -285,6 +288,8 @@ export default {
         });
     },
     backScan() {
+      let orderNumber = this.$route.query.orderNumber;
+      this.axios.post("/api/v1/tms/changeNumber?orderNumber=" + orderNumber)
       this.$router.go(-1);
     }
   }

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

@@ -1,4 +1,4 @@
-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <div class="saleSelfMachine">
     <div class="background">
       <img :src="backgroundImgURL" width="100%" height="100%" />
@@ -10,27 +10,38 @@
         :focus="true"
         ref="inputs"
         :disabled="!isEdit"
+        v-show="false"
       >
       </el-input>
-      <div style="display:block;width:120px">
+      <!--style="display:block;width:120px"-->
+      <div  v-show="false">
         手动输入开关：
       </div>
-      <el-switch
+      <i class="el-icon-full-screen" @click="fullScreen"
+      v-show="edit1"></i>
+<!--      <el-switch
         v-model="isEdit"
         active-color="#66ccff"
         inactive-color="#ffffff"
       >
-      </el-switch>
+      </el-switch>-->
+    </div>
+    <div class="tip">
+      将手机二维码对准摄像头<br>
+      扫描<br>
+      <i class="el-icon-bottom" style="padding-left: 150px;font-size: 100px"></i>
     </div>
   </div>
 </template>
 <script>
+import screenfull from "screenfull"
 export default {
   data() {
     return {
       orderNumber: null,
       isEdit: true,
-      backgroundImgURL: require("@/assets/saleSelfMachine/scanCode.jpg")
+      edit1: true,
+      backgroundImgURL: require("@/assets/saleSelfMachine/backgroundImg.jpg")
     };
   },
   created() {
@@ -45,6 +56,28 @@ export default {
       this.$nextTick(x => {
         this.$refs.inputs.focus();
       });
+    },
+    fullScreen() {
+      if (screenfull.isEnabled && !screenfull.isFullscreen) {
+        screenfull.request();
+        this.edit1=false
+      }
+    },
+    async querynumber(){
+      console.log(this.orderNumber)
+      let orderNumber=this.orderNumber
+      let i=0
+      await this.axios.post("/api/v1/tms/queryNumber?orderNumber=" + orderNumber)
+        .then((res)=>{
+          console.log("查找出来的数据")
+          console.log(res.data)
+          console.log("-------------------------")
+          if (res.data.printnumber==1){
+            i=1
+          }
+        })
+      console.log(i)
+      return i
     }
     //失去焦点后自动执行获得焦点事件
     // onInputBlur(){
@@ -58,8 +91,9 @@ export default {
     // }
   },
   mounted() {
+    console.log(screenfull.isFullscreen);
     // this.changfouce();
-    const timer = setInterval(() => {
+    const timer = setInterval(async () => {
       // if(this.$refs.inputs.focus==false){
       //     console.log("false")
       this.changfouce();
@@ -69,6 +103,13 @@ export default {
           this.orderNumber.startsWith("WYSDD") == true ||
           this.orderNumber.startsWith("wysdd") == true
         ) {
+          let promise = await this.querynumber(this.orderNumber);
+          console.log(promise)
+          if (promise==1){
+            this.$message.error("你已经打印过了")
+            this.orderNumber=null
+            return
+          }
           this.$router.push({
             path: "/printReceipt?orderNumber=" + this.orderNumber
           });
@@ -103,5 +144,13 @@ export default {
     justify-content: center;
     align-items: center;
   }
+  .tip{
+    width: 1000px;
+    height: 300px;
+    font-size: 60px;
+    padding-left: 300px;
+    padding-top: 200px;
+    color: #e6e6e6;
+  }
 }
 </style>

src/views/statisticalReport/app.js

@@ -26,6 +26,11 @@ Vue.use(tableToExcel);
 import htmlToPdf from "@/components/exportPdfs/exportPdfs";
 Vue.use(htmlToPdf);
 //导出PDF组件
+import "xe-utils";
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
+Vue.use(VXETable);
+Vue.prototype.$XModal = VXETable.modal;
 
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;

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

@@ -1,10 +1,10 @@
 //化产焦炭统计报表
 <template>
-  <div class="purchasFuelNewMonitor">
+  <div>
     <div class="frameCalculation">
-      <el-form :inline="true" style="margin-top :5px">
+      <el-form :inline="true" >
         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;"
+          <label style="width: 200px;margin-left: 10px"
             >计毛时间：</label
           >
           <el-date-picker
@@ -36,19 +36,18 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="wareHouse"
-              style="width:200px"
-              placeholder="查询仓库"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>
-          </el-button>
         </el-form-item>
-
+        <el-form-item>
+          <el-input
+            v-model="wareHouse"
+            style="width:200px"
+            placeholder="查询仓库"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>
+        </el-button>
         <el-form-item>
           <el-button type="primary" @click="exportData()"
             ><i class="el-icon-download"></i>Excel</el-button
@@ -59,7 +58,7 @@
             <i class="el-icon-refresh"></i>
           </el-button>
         </el-form-item>
-        <el-form-item>
+        <el-form-item >
           <span>合计净重：</span>
           <el-input
             v-model="totalNumber"
@@ -312,7 +311,6 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
   .frameCalculation {
     margin-left: 20px;
     margin-top: 20px;
@@ -321,5 +319,4 @@ export default {
     margin-left: 20px;
     margin-top: 20px;
   }
-}
 </style>

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

@@ -159,7 +159,7 @@
           width="150px"
         >
         </el-table-column>
-        <el-table-column prop="materialSpe" label="物资规格" align="center">
+        <el-table-column prop="materialSpe" label="物资规格" align="center" sortable>
         </el-table-column>
         <el-table-column
           prop="materialNum"
@@ -228,6 +228,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="toPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看抵达图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
@@ -235,6 +245,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="receipctPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看签收图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="orderNo"
@@ -263,6 +283,11 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印状态"
+          align="center"
+        ></el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
@@ -274,6 +299,19 @@
         </el-table-column>
         <el-table-column prop="truckNo" label="车序号"> </el-table-column>
         <el-table-column prop="consigneeTel" label="收货客户电话" width="120px">
+          <template slot-scope="scope">
+            <el-input
+              style="width:120px"
+              v-model="scope.row.consigneeTel"
+              placeholder="请输入电话号码"
+            ></el-input>
+            <el-button
+              @click="updateconsigneeTel(scope.row)"
+              type="primary"
+              v-if="scope.row.isconsigneeTelShow == 1"
+            >提交</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
         </el-table-column>
@@ -339,6 +377,28 @@
         </el-table-column>
       </el-table>
     </div>
+    <div>
+      <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center;"
+            :src="src"
+            :preview-src-list="srcList"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+      <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center"
+            :src="src2"
+            :preview-src-list="srcList2"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+    </div>
     <div class="address">
       <!-- 收货地址弹出框 -->
       <el-dialog title="收货地址" :visible.sync="drawer" width="90%">
@@ -534,7 +594,13 @@ export default {
       //省市县Id
       addressId: null,
       addressRow: {},
-      operateShow: 0
+      operateShow: 0,
+      srcList: [],
+      src: "",
+      isShow: false,
+      srcList2: [],
+      src2: "",
+      isShow2: false
     };
   },
   created() {},
@@ -542,6 +608,33 @@ export default {
     this.getSteelReport();
   },
   methods: {
+    //查看抵达图
+    toPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getArrivalPhoto?orderNumber=" + orderNo)
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+    //查看签收图
+    receipctPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + orderNo)
+        .then(res => {
+          console.log(res.data);
+          this.isShow2 = true;
+          this.srcList2 = [];
+          this.src2 = res.data.resultSignedNotePhoto;
+          this.srcList2.push(res.data.resultSignedNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
+          }
+        });
+    },
     rowClick() {
       if (this.operateShow == 1) {
         this.operateShow = 0;
@@ -553,8 +646,8 @@ export default {
     adverseCloseSaleMaterial(row) {
       console.log(row.saleMaterialId);
       this.$confirm("确定反关闭该条分录?", "提示", {
-        cancelButtonText: "确定",
-        confirmButtonText: "取消",
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
         center: true
       }).then(() => {
         this.axios
@@ -622,6 +715,7 @@ export default {
             this.$set(item, "isTelShow", 0);
             this.$set(item, "isAddressShow", 0);
             this.$set(item, "isNumShow", 0);
+            this.$set(item, "isconsigneeTelShow", 0);
           }
         });
       }
@@ -645,6 +739,10 @@ export default {
         this.$set(row, "isNumShow", 1);
         this.clickIndex = row.group;
       }
+      if (column.property == "consigneeTel") {
+        this.$set(row, "isconsigneeTelShow", 1);
+        this.clickIndex = row.group;
+      }
     },
     //承运商弹出层
     handleSelectCarrier(row, index, item) {
@@ -835,6 +933,41 @@ export default {
           loading.close();
         });
     },
+    //修改收货客户电话
+    updateconsigneeTel(row) {
+      const loading = this.$loading({
+        lock: true,
+        text: "修改电话号码中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      if (row.consigneeTel == null || row.consigneeTel == "") {
+        this.$message.error("电话号码不能为空");
+        return;
+      }
+      this.axios
+        .post("/api/v1/ams/updateConsigneeTel", {
+          saleOrderNo:row.saleOrderNo,
+          saleMaterialId:row.saleMaterialId,
+          consigneeTel:row.consigneeTel
+        })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改成功");
+            this.getSteelReport();
+            loading.close();
+          } else {
+            this.$message.error("修改失败");
+            this.getSteelReport();
+            loading.close();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改失败");
+          this.getSteelReport();
+          loading.close();
+        });
+    },
     //关闭车辆金蝶分录
     deleteEasEntryId(row) {
       this.$confirm("确定关闭该车金蝶分录吗?", "提示", {

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 +