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

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.js

@@ -34,7 +34,6 @@ export default {
       window.addEventListener("resize", this.getHeight);
       this.getHeight();
     }
-
     this.dataCurrentPage = this.currentPage;
     this.dataPageSize = this.pageSize;
     this.requestData();
@@ -82,27 +81,6 @@ export default {
     getHeight() {
       this.height = window.innerHeight - this.shiyHeigth;
     },
-    //计算合计列
-    getSummaries(columns, data) {
-      const sums = [];
-      columns.forEach((column, index) => {
-        const values = data.map(item => Number(item[column.property]));
-        if (column.property == "resultNetWeight") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-
-          sums[index];
-        }
-      });
-      // console.log("净重：" + sums)
-      return sums;
-    },
     // 通过请求获取数据
     requestData(options) {
       console.log(options);
@@ -150,16 +128,14 @@ export default {
               let d = response.data.data;
               this.dataTabel = d.list;
               this.getSpanArr(this.dataTabel);
+              console.log(this.dataTabel);
               this.dataTotal = d.total;
-
               //执行成功的回调
               this.$emit("func", response.data.data);
               this.refreshColumnData(d.columnData);
               this.isShow = true;
             })
-            .catch(() => {
-              console.log();
-            });
+            .catch(() => {});
         } else {
           // 发送请求
           this.axios
@@ -175,6 +151,7 @@ export default {
               this.dataTabel = d.list;
               this.dataTotal = d.total;
               this.getSpanArr(this.dataTabel);
+              console.log(this.dataTabel);
               //执行成功的回调
               this.$emit("func", response.data.data);
               this.refreshColumnData(d.columnData);
@@ -189,9 +166,9 @@ export default {
     refreshColumnData(columnData) {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
 
-      if (this.dataColumnData.length > 0) {
-        return;
-      }
+      // if (this.dataColumnData.length > 0) {
+      //   return;
+      // }
       // 如果前端有写表头，则加在后端表头前面
 
       const d = this.columnData.concat(columnData);

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -13,7 +13,7 @@
           <el-button  type="primary">导入车皮号(Excel)</el-button>
       </el-upload>
       <div style="margin-right:200px;">当前导入数量：{{tableData.length}}</div>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>下载Excel模板</el-button>
+      <!-- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>下载Excel模板</el-button> -->
     </div>
     <div>
       <span style="color:red">导入数据中的 品名、发货单位、车号、发站 是必须的</span>

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

@@ -187,7 +187,7 @@
                 <el-input
                   v-if="scope.row.haveMeter == 1"
                   class="textinput111"
-                  v-model.number="scope.row.meterNumber"
+                  v-model="scope.row.meterNumber"
                   placeholder="(必填)"
                   :disabled="scope.row.isDisable == 1"
                 ></el-input>
@@ -244,7 +244,11 @@
       <el-button type="primary" class="btn" @click="singleDistribute"
         >单拼分配到每车</el-button
       >
-      <el-button type="primary" class="btn" @click="createACar"
+      <el-button
+        type="primary"
+        class="btn"
+        @click="createACar"
+        style="margin-left:20px"
         >添加到订单</el-button
       >
     </div>
@@ -318,7 +322,7 @@
                 <el-input
                   v-if="scope.row.haveMeter == 1"
                   class="textinput"
-                  v-model.number="scope.row.meterNumber"
+                  v-model="scope.row.meterNumber"
                   :disabled="scope.row.isDisable == 1"
                 ></el-input>
               </template>
@@ -984,16 +988,26 @@ export default {
     onchangeProvince() {
       this.axios
         .post(
-          "/api/v1/uc/getDistrictByProvince?addressProvince=" + this.province
+          "/api/v1/uc/getDistrictByProvince?addressProvince=" +
+            this.province +
+            "&i=" +
+            new Date()
         )
         .then(res => {
           this.cityList = res.data.data;
+          // this.city = "";
+          // this.county = "";
         });
     },
     //市改变
     onchangeCity() {
       this.axios
-        .post("/api/v1/uc/getTownByDistrict?addressDistrict=" + this.city)
+        .post(
+          "/api/v1/uc/getTownByDistrict?addressDistrict=" +
+            this.city +
+            "&i=" +
+            new Date()
+        )
         .then(res => {
           this.countyList = res.data.data;
         });
@@ -1065,6 +1079,9 @@ export default {
           this.place1 = place[0].place;
           this.saleMan = place[0].salerId;
           this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
+          this.province = place[0].addressProvince;
+          this.city = place[0].addressDistrict;
+          this.county = place[0].addressTown;
         });
     },
     //以下是下单客户边输边查搜索
@@ -1601,6 +1618,8 @@ export default {
       this.frist.requestUrl =
         "/api/v1/ams/getAddressDeliveryAddress?apiId=255&i=" + new Date();
       this.drawer1 = true;
+      this.onchangeProvince();
+      this.onchangeCity();
     },
     //点击内层收货地址浏览事件
     ondrawer(row, index) {
@@ -1612,6 +1631,8 @@ export default {
       this.frist.requestUrl =
         "/api/v1/ams/getAddressDeliveryAddress?apiId=255&i=" + new Date();
       this.drawer1 = true;
+      this.onchangeProvince();
+      this.onchangeCity();
     },
     //查询全国省市县
     selectAddresClick() {
@@ -1682,17 +1703,17 @@ export default {
           this.province + this.city + this.county + this.place;
         this.drawer1 = false;
       }
-      //初始化
-      this.addressId = null;
-      this.province = null;
-      this.cityList = [];
-      this.city = null;
-      this.countyList = [];
-      this.county = null;
+      // //初始化
+      // this.addressId = null;
+      // this.province = null;
+      // this.cityList = [];
+      // this.city = null;
+      // this.countyList = [];
+      // this.county = null;
       //暂存具体地址
       this.place1 = this.place;
-      this.place = null;
-      this.addresText = null;
+      // this.place = null;
+      // this.addresText = null;
     },
     //批量修改内层值
     batchUpdateValue(row, index) {

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

@@ -192,21 +192,20 @@ export default {
       carrierName: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408",
+        requestUrl: "",
         selectionType: "select",
         comparison: "saleNumber",
         columnIndexs: [0, 1, 2, 3, 4, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
+        requestUrl: "",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1",
+        requestUrl: "",
         comparison: "saleNumber",
         columnIndexs: [
           0,
@@ -231,7 +230,7 @@ export default {
       },
       option5: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSteelOrderDeletedList?apiId=409",
+        requestUrl: "",
         comparison: "saleNumber",
         columnIndexs: [
           0,
@@ -262,39 +261,62 @@ export default {
     if (getCookie("orgCode") == "shouhuokehu") {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" +
-        getCookie("userId");
+        getCookie("userId") +
+        "&i=" +
+        new Date();
       this.option2.requestUrl =
         "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
-        getCookie("userId");
+        getCookie("userId") +
+        "&i=" +
+        new Date();
       this.option4.requestUrl =
         "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&consigneeSsoId=" +
         getCookie("userId");
       this.option5.requestUrl =
         "/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=" +
-        getCookie("userId");
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else if (getCookie("orgCode") == "xiaoshouyewuyuan") {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=" +
-        getCookie("loginName");
+        getCookie("loginName") +
+        "&i=" +
+        new Date();
       this.option2.requestUrl =
         "/api/v1/ams/getSaleOrderReportedes?apiId=408&saler=" +
-        getCookie("loginName");
+        getCookie("loginName") +
+        "&i=" +
+        new Date();
       this.option4.requestUrl =
         "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&saler=" +
-        getCookie("loginName");
+        getCookie("loginName") +
+        "&i=" +
+        new Date();
       this.option5.requestUrl =
         "/api/v1/ams/getSteelOrderDeletedList?apiId=409&saler=" +
         getCookie("loginName");
     } else {
       this.option.requestUrl =
-        "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" + null;
+        "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" +
+        null +
+        "&i=" +
+        new Date();
       this.option2.requestUrl =
-        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" + null;
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
+        null +
+        "&i=" +
+        new Date();
       this.option4.requestUrl =
         "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&consigneeSsoId=" +
-        null;
+        null +
+        "&i=" +
+        new Date();
       this.option5.requestUrl =
-        "/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=" + null;
+        "/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
   },
   methods: {
@@ -443,15 +465,27 @@ export default {
         this.$message.error("请先选择需要批量上传的销售订单");
         return;
       }
+      const loading = this.$loading({
+        lock: true,
+        text: "正在努力上传",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
       this.axios
         .post("/api/v1/ams/uploadSaleOrderList", this.batchReportList)
         .then(res => {
           if (res.data.code == "200") {
             this.$message.success("上传成功");
             this.getRequestUrl();
+            loading.close();
           } else {
             this.$message.error("上传失败");
+            loading.close();
           }
+        })
+        .catch(() => {
+          this.$message.error("上传失败");
+          loading.close();
         });
     },
     selectionChange(selection) {
@@ -564,16 +598,27 @@ export default {
         center: true
       })
         .then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: "正在努力上传",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)"
+          });
           this.axios
             .post("/api/v1/ams/uploadSaleOrder?saleOrderId=" + saleOrderId)
             .then(res => {
               if (res.data.code == "200") {
                 this.$message.success("上传成功！");
                 this.getRequestUrl();
+                loading.close();
               } else {
                 this.$message.success("上传失败！");
                 this.getRequestUrl();
+                loading.close();
               }
+            })
+            .catch(() => {
+              loading.close();
             });
         })
         .catch(() => {

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

@@ -570,6 +570,7 @@ export default {
     closeFlu(scope) {
       this.capacityNumber = scope.row.capacityNumber;
       this.deleteEasEntryId(scope.row);
+      console.log(scope.row);
     },
     //车辆变更
     updateCapacity(scope) {
@@ -676,12 +677,15 @@ export default {
             .then(res => {
               if (res.data.code == "200") {
                 this.$message.success("关闭成功");
+                this.getOrderList();
               } else {
                 this.$message.error("关闭失败");
+                this.getOrderList();
               }
             })
             .catch(() => {
               this.$message.error("关闭失败");
+              this.getOrderList();
             });
         })
         .catch(() => {

src/views/appoint/router/index.js

@@ -357,7 +357,7 @@ const constantRouterMap = [
       {
         path: "saleCokeInward",
         name: "saleCokeInward",
-        meta: { code: "xtpzgl-yhgl" },
+        meta: { code: "xtpzgl-yhgl", keepAlive: true },
         component: saleCokeInward
       },
       {
@@ -375,13 +375,13 @@ const constantRouterMap = [
       {
         path: "saleOrderCoproduct",
         name: "saleOrderCoproduct",
-        meta: { code: "xtpzgl-yhgl" },
+        meta: { code: "xtpzgl-yhgl", keepAlive: true },
         component: saleOrderCoproduct
       },
       {
         path: "saleOrderCoproductCarrier",
         name: "saleOrderCoproductCarrier",
-        meta: { code: "xtpzgl-yhgl" },
+        meta: { code: "xtpzgl-yhgl", keepAlive: true },
         component: saleOrderCoproductCarrier
       },
       {

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

@@ -255,9 +255,6 @@ export default {
       materialModelText: null
     };
   },
-  watch: {
-    activeName() {}
-  },
   created() {
     this.myWebsocket();
   },
@@ -265,10 +262,21 @@ export default {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
+    this.wantEnfactory();
   },
+  // computed: {
+  //   wantS() {
+  //     return this.totalNoEntryTime;
+  //   }
+  // },
   methods: {
-    myWebsocket() {
-      let wss = new WebSocket("wss:wl.dasteel.cn:32322/websocket/socketServer");
+    // myWebsocket() {
+    //   let wss = new WebSocket("wss:wl.dasteel.cn:32322/websocket/socketServer");
+    // },
+    wantEnfactory() {
+      this.axios.get("/api/v1/uc/getQueueCount").then(res => {
+        console.log(res.data);
+      });
     },
     refresh() {
       this.getSpellingArray();