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

build/utils.js

@@ -22,6 +22,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // 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'];
 

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/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -140,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"
@@ -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"
@@ -665,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/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/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"
@@ -299,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>
@@ -702,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);
           }
         });
       }
@@ -725,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) {
@@ -915,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("确定关闭该车金蝶分录吗?", "提示", {