提交

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-let devModules = ['index', 'statisticalReport', 'queue']
-// let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'queue', 'appoint']
+let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址r
   '/api/v1': {
-    // target: 'http://172.16.33.166:80',
-    target: 'http://localhost:8080',
+    target: 'http://172.16.33.166:80',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -2660,13 +2660,13 @@ export default {
           this.taskAllNum = res.data.data[0].taskAllNum
           console.log(this.noticedata)
           console.log(this.taskAllNum)
-          if (this.taskAllNum !=null){
-            if (this.taskAllNum==0){
-              console.log("进入了标记为0")
-              this.badgeshow=true
-            }else{
-              console.log("进入了标记不为0")
-              this.badgeshow=false
+          if (this.taskAllNum != null) {
+            if (this.taskAllNum == 0) {
+              console.log('进入了标记为0')
+              this.badgeshow = true
+            } else {
+              console.log('进入了标记不为0')
+              this.badgeshow = false
               // if(this.$store.state.index==1){
               //   let data={
               //     noticetitle:this.noticedata[0].noticetitle,
@@ -2718,6 +2718,7 @@ export default {
   height: 500px;
   background-color: #f1f6fd;
 }
+
 /deep/ .privilegeArea {
   .el-dialog {
     min-width: 400px;
@@ -2734,6 +2735,10 @@ export default {
   display: none;
 }
 
+iframe {
+  display: block !important;
+}
+
 /deep/.lockInput .el-input__inner {
   -webkit-text-security: disc !important;
 }
@@ -2834,7 +2839,7 @@ export default {
   ::-webkit-scrollbar {
     //滚动条宽高，如果不需要显示滚动条可设置宽高为0
 
-    width: 10px;
+    width: 0px;
     height: 10px;
   }
   ::-webkit-scrollbar-thumb {

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

@@ -121,12 +121,12 @@
             <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
               type="selection"
-              width="40"
+              width="30"
               reserve-selection
               align="center"
               :selectable="selectInit"
             ></el-table-column>
-            <el-table-column label="装货点" width="110">
+            <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -154,13 +154,13 @@
               prop="listNodeOrder"
               label="序号"
               align="center"
-              width="40"
+              width="30"
             ></el-table-column>
             <el-table-column
               prop="resultStartTime"
               label="排队开始时间"
               align="center"
-              width="160"
+              width="150"
             >
             </el-table-column>
             <el-table-column
@@ -168,7 +168,7 @@
               label="客户"
               fit
               show-overflow-tooltip
-              width="180"
+              width="170"
             >
             </el-table-column>
             <el-table-column
@@ -234,12 +234,12 @@
           >
             <el-table-column
               type="selection"
-              width="40"
+              width="30"
               align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
-            <el-table-column label="装货点" width="110">
+            <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -268,19 +268,19 @@
               prop="listNodeOrder"
               label="序号"
               align="center"
-              width="40"
+              width="30"
             ></el-table-column>
             <el-table-column
               prop="resultStartTime"
               label="排队开始时间"
-              width="160"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               prop="consigneeName"
               label="客户"
               fit
-              width="180"
+              width="170"
               show-overflow-tooltip
             >
             </el-table-column>
@@ -354,12 +354,12 @@
           >
             <el-table-column
               type="selection"
-              width="40"
+              width="30"
               align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
-            <el-table-column label="装货点" width="110">
+            <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -387,17 +387,23 @@
             <el-table-column
               prop="listNodeOrder"
               label="序号"
-              width="40"
+              width="30"
               align="center"
             ></el-table-column>
             <el-table-column
               prop="resultStartTime"
               label="排队开始时间"
               align="center"
-              width="160"
+              width="150"
             >
             </el-table-column>
-            <el-table-column prop="consigneeName" label="客户" fit width="180">
+            <el-table-column
+              prop="consigneeName"
+              label="客户"
+              fit
+              width="170"
+              show-overflow-tooltip
+            >
             </el-table-column>
             <el-table-column
               prop="materialName"
@@ -796,14 +802,14 @@ export default {
           .then(res => {
             this.tableData1 = res.data.data
           })
-      } else if (this.activeName == second) {
+      } else if (this.activeName == 'second') {
         this.axios
           .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1', map)
           .then(res => {
             this.tableData = res.data.data
             this.getSpanArr(this.tableData)
           })
-      } else if (this.activeName == fourth) {
+      } else if (this.activeName == 'fourth') {
         this.axios
           .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2', map)
           .then(res => {
@@ -1085,9 +1091,9 @@ export default {
           value => value.materialPriority === this.maplist[i].id
         )
         console.log('warehouse', warehouse)
-        if (warehouse && warehouse.carQueue >= 20) {
+        if (warehouse && warehouse.carQueue >= 30) {
           this.$message({
-            message: '该仓库已经有20辆车在排队，不允许放行！',
+            message: '该仓库已经有30辆车在排队，不允许放行！',
             type: 'error',
             duration: 2000,
             center: true,

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

@@ -471,7 +471,8 @@ export default {
         'materialModel',
         'materialNumber',
         'steelMeters',
-        'isPoundSale'
+        'isPoundSale',
+        'carrierId'
       ],
       saleDateOfReceipt: null,
       remarkDateNew: null,
@@ -999,9 +1000,9 @@ export default {
       }
       if (this.screen1 == '下单客户') {
         consigneeName = this.input1
-      } else if (this.screen == '承运商') {
+      } else if (this.screen1 == '承运商') {
         carrierName = this.input1
-      } else if (this.screen == '车牌号') {
+      } else if (this.screen1 == '车牌号') {
         capacityNo = this.input1
       } else {
         remark = this.input1