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

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: {

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

@@ -262,13 +262,13 @@ export default {
         requestUrl: "",
         selectionType: "select",
         comparison: "saleNumber",
-        columnIndexs: [0,1,2,7,8,9, 10, 11, 12, 13, 14, 15, 16, 17]
+        columnIndexs: [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
         requestUrl: "",
         comparison: "saleNumber",
-        columnIndexs: [0,1,6,7,8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址
@@ -478,7 +478,6 @@ export default {
       var workbook = null;
       //设置读取操作
       reader.onload = function(e) {
-        console.log(e);
         data = e.target.result;
         workbook = XLSX.read(data, {
           type: "binary"
@@ -565,7 +564,7 @@ export default {
                 }
               }
               if (e1.includes("车序号")) {
-                if (isNumber(e[e1])) {
+                if (typeof e[e1] != "undefined" && isNumber(e[e1])) {
                   map.truckNo = e[e1];
                 } else {
                   throw new Error(
@@ -629,7 +628,15 @@ export default {
             if (typeof map.isSelfMention === "undefined") {
               map.isSelfMention = "否";
             }
-            if (map.saleRemark && map.receiveName && map.materialName) {
+            if (
+              map.saleRemark &&
+              map.receiveName &&
+              map.materialName &&
+              map.truckNo &&
+              map.province &&
+              map.district &&
+              map.saleArea
+            ) {
               that.tableData.push(map);
             }
           } catch (e) {
@@ -884,6 +891,7 @@ export default {
         });
     },
     deleteSaleOrder(row) {
+      console.log(row);
       this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -899,7 +907,9 @@ export default {
               reason: value
             };
             this.axios
-              .post("/api/v1/ams/deleteSaleOrderSame", mapValue)
+              .post(
+                "/api/v1/ams/deleteSaleOrderById?saleOrderId=" + row.saleOrderId
+              )
               .then(res => {
                 if (res.data.code == 200) {
                   this.$message.success("关闭成功");

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

@@ -1,97 +1,107 @@
 <template>
-    <div class="saleSelfMachine">
-        <div class="background">
-            <img :src="backgroundImgURL" width="100%" height="100%"/>
-        </div>
-        <div class="orderNumberData">
-            <el-input placeholder="请将二维码放置在扫描区" v-model="orderNumber" :focus="true" ref="inputs" :disabled="!isEdit">
-            </el-input>
-            <div style="display:block;width:120px">
-                手动输入开关：
-            </div>
-            <el-switch
-            v-model="isEdit"
-            active-color="#66ccff"
-            inactive-color="#ffffff">
-            </el-switch>
-        </div>
-    </div>    
+  <div class="saleSelfMachine">
+    <div class="background">
+      <img :src="backgroundImgURL" width="100%" height="100%" />
+    </div>
+    <div class="orderNumberData">
+      <el-input
+        placeholder="请将二维码放置在扫描区"
+        v-model="orderNumber"
+        :focus="true"
+        ref="inputs"
+        :disabled="!isEdit"
+      >
+      </el-input>
+      <div style="display:block;width:120px">
+        手动输入开关：
+      </div>
+      <el-switch
+        v-model="isEdit"
+        active-color="#66ccff"
+        inactive-color="#ffffff"
+      >
+      </el-switch>
+    </div>
+  </div>
 </template>
 <script>
 export default {
-    data(){
-        return{
-            orderNumber:null,
-            isEdit:false,
-            backgroundImgURL:require('@/assets/saleSelfMachine/scanCode.jpg'),
-        }
-    },
-    created(){
-        this.changfouce();
-    },
-    // watch:{
-    //    data:"toSaleSelfMachine"
-    // },
-    methods:{
-        //输入框自动聚焦
-        changfouce(){
-        this.$nextTick((x)=>{
+  data() {
+    return {
+      orderNumber: null,
+      isEdit: true,
+      backgroundImgURL: require("@/assets/saleSelfMachine/scanCode.jpg")
+    };
+  },
+  created() {
+    this.changfouce();
+  },
+  // watch:{
+  //    data:"toSaleSelfMachine"
+  // },
+  methods: {
+    //输入框自动聚焦
+    changfouce() {
+      this.$nextTick(x => {
         this.$refs.inputs.focus();
-        })
-        },
-        //失去焦点后自动执行获得焦点事件
-        // onInputBlur(){
-        //     console.log("获取焦点")
-        //     this.changfouce();
-        // }
-        // toSaleSelfMachine(){
-        //      this.$router.push({
-        //         path:'/saleSelfMachine',
-        //     })
-        // }
-    },
-    mounted(){
-        // this.changfouce();
-    const timer = setInterval(()=>{
-        // if(this.$refs.inputs.focus==false){
-        //     console.log("false")
-            this.changfouce();
-        //}
-         if(this.orderNumber!=null&&this.orderNumber.length==21){
-            if(this.orderNumber.startsWith('WYSDD')==true||this.orderNumber.startsWith('wysdd')==true){
-                this.$router.push({
-                        path:"/saleSelfMachine?orderNumber="+this.orderNumber,
-                })
-            }
-        }else if(this.orderNumber.length>21){
-            //清空输入框，免得一次多个重复订单还无法删除
-            this.orderNumber=null;
-        } 
-    },3000)
-    this.$once('hook:beforeDestroy', ()=>{
-        clearInterval(timer)
-    })
-} 
-}
+      });
+    }
+    //失去焦点后自动执行获得焦点事件
+    // onInputBlur(){
+    //     console.log("获取焦点")
+    //     this.changfouce();
+    // }
+    // toSaleSelfMachine(){
+    //      this.$router.push({
+    //         path:'/saleSelfMachine',
+    //     })
+    // }
+  },
+  mounted() {
+    // this.changfouce();
+    const timer = setInterval(() => {
+      // if(this.$refs.inputs.focus==false){
+      //     console.log("false")
+      this.changfouce();
+      //}
+      if (this.orderNumber != null && this.orderNumber.length == 21) {
+        if (
+          this.orderNumber.startsWith("WYSDD") == true ||
+          this.orderNumber.startsWith("wysdd") == true
+        ) {
+          this.$router.push({
+            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+          });
+        }
+      } else if (this.orderNumber.length > 21) {
+        //清空输入框，免得一次多个重复订单还无法删除
+        this.orderNumber = null;
+      }
+    }, 3000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+  }
+};
 </script>
 <style lang="scss">
-    .saleSelfMachine{
-        width: 100vh;
-        height: 100vh;
-        .background {
-            width: 100%;
-            height: 100%; 
-            z-index: -1;
-            position: absolute;
-            overflow: hidden;
-        }
-        .orderNumberData{
-            width: 100%;
-            color: #fff;
-            position: absolute;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-    }
-</style>
+.saleSelfMachine {
+  width: 100vh;
+  height: 100vh;
+  .background {
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    position: absolute;
+    overflow: hidden;
+  }
+  .orderNumberData {
+    width: 100%;
+    color: #fff;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

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

@@ -713,6 +713,7 @@ export default {
       });
     },
     updateCapacity(row) {
+      row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;
@@ -1234,8 +1235,33 @@ export default {
     },
     //获取钢材统计报表
     getSteelReport() {
+      let startTime = null;
+      let endTime = null;
       let carrierSsoId = null;
+      let carrierName = null;
+      let consigneeName = null;
+      let capacityNo = null;
+      let remark = null;
       let saler = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        saler = getCookie("loginName");
+      }
+      if (this.screen == "下单客户") {
+        consigneeName = this.input;
+      } else if (this.screen == "承运商") {
+        carrierName = this.input;
+      } else if (this.screen == "车牌号") {
+        capacityNo = this.input;
+      } else {
+        remark = this.input;
+      }
       if (getCookie("orgCode") == "chengyunshang") {
         carrierSsoId = getCookie("userId");
       }
@@ -1253,7 +1279,15 @@ export default {
             "&saler=" +
             saler +
             "&i=" +
-            new Date()
+            new Date() +
+            "&remark=" +
+            remark +
+            "&consigneeName=" +
+            consigneeName +
+            "&carrierName=" +
+            carrierName +
+            "&capacityNo=" +
+            capacityNo
         )
         .then(res => {
           this.tableData = res.data.data;