d

config/index.js

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

src/components/main.vue

@@ -946,7 +946,8 @@ export default {
         noticecontent:'ceshi',
         insertusername:'ceshi',
         inserttime:'ceshi'
-      }
+      },
+      allowed: []
     }
   },
   created() {

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

@@ -181,6 +181,82 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <el-tab-pane label="两拼车辆排队链表" name="fourth">
+          <el-table
+            :data="tableData2"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            :row-key="getRowKey"
+            max-height="500px"
+            ref="spellData"
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+              reserve-selection
+              :selectable="selectInitSplleing"
+            ></el-table-column>
+            <el-table-column prop="capacityNumber" label="车牌号" fit>
+            </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></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="物资名称">
+            </el-table-column>
+            <el-table-column prop="steelMeter" label="钢材长度">
+            </el-table-column>
+            <el-table-column prop="materialSpecification" label="规格型号">
+            </el-table-column>
+            <el-table-column prop="materialNumber" label="物资件数">
+            </el-table-column>
+            <el-table-column label="装货点" width="100">
+              <template slot-scope="scope">
+                <el-select
+                  size="mini"
+                  v-model="scope.row.id"
+                  @change="changePriority(scope.row)"
+                >
+                  <el-option
+                    v-for="item in option"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="grid" label="拼数" fit> </el-table-column>
+            <el-table-column prop="driverTel" label="司机电话号码">
+            </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
+            <el-table-column prop="sureTime" label="可进厂确认时间">
+            </el-table-column>
+
+            <el-table-column fixed="right" label="操作" width="180">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="ctrlZQueueAllow(scope)"
+                >
+                  撤销放行
+                </el-button>
+                <el-button type="text" size="mini" @click="updateBill(scope)">
+                  修改提货单
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
         <el-tab-pane label="多拼车辆排队链表" name="second">
           <el-table
             :data="tableData"
@@ -297,6 +373,7 @@ export default {
       activeName: 'first',
       tableData: [],
       tableData1: [],
+      tableData2:[],
       tableData3: [],
       //存放每一行记录的合并数
       spanArr: [],
@@ -492,13 +569,20 @@ export default {
           .then(res => {
             this.tableData1 = res.data.data
           })
-      } else {
+      } 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){
+        this.axios
+          .post('/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2', map)
+          .then(res => {
+            this.tableData2 = res.data.data
+            this.getSpanArr(this.tableData2)
+          })
       }
       this.table1 = false
     },
@@ -565,6 +649,8 @@ export default {
         this.getNoSpellingArray()
       } else if (this.activeName == 'second') {
         this.getSpellingArray()
+      }else if (this.activeName == 'fourth'){
+        this.getSpellingArrayTwo()
       } else {
         this.getStoreArray()
       }
@@ -591,6 +677,19 @@ export default {
           this.getSpanArr(this.tableData)
         })
     },
+    getSpellingArrayTwo() {
+      this.axios
+        .post(
+          '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2&i=' +
+          new Date()
+        )
+        .then(res => {
+          this.tableData2 = res.data.data
+          this.isQueryCapacity = null
+          console.log(this.tableData2)
+          this.getSpanArr(this.tableData2)
+        })
+    },
     getStoreArray() {
       this.axios.post('/api/v1/qms/getStoreQueueList').then(res => {
         this.tableData3 = res.data.data
@@ -611,7 +710,7 @@ export default {
             this.tableData1 = res.data.data
           })
         console.log('wzxxx')
-      } else {
+      } else if (this.activeName == second){
         this.axios
           .post(
             '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
@@ -624,6 +723,19 @@ export default {
             this.tableData = res.data.data
             this.getSpanArr(this.tableData)
           })
+      }else if (this.activeName ==fourth){
+        this.axios
+          .post(
+            '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2&i=' +
+            new Date() +
+            '&capacityNumber=' +
+            this.capacityNo
+          )
+          .then(res => {
+            this.isQueryCapacity = 1
+            this.tableData2 = res.data.data
+            this.getSpanArr(this.tableData2)
+          })
       }
     },
     handleSelectionChange(selection) {
@@ -716,6 +828,8 @@ export default {
       if (this.activeName == 'first') {
         map.mapList = this.maplist
       }
+      console.log("勾选的数据")
+      console.log(map)
       this.axios.post('/api/v1/qms/allowEnFactory', map).then(res => {
         if (res.data.code == '200') {
           this.$message({

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -3,7 +3,7 @@
     <div class="shipReport">
       <div class="title">船舶动态表</div>
       <div class="top">
-        <el-input
+        <!-- <el-input
           class="el-input"
           placeholder="请输入品名"
           v-model="input"
@@ -12,7 +12,10 @@
         </el-input>
         <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>查询
-        </el-button>
+        </el-button> -->
+         <el-button type="primary" class="btn" @click="reflush">
+          <i class="el-icon-search"></i>刷新
+         </el-button>
         <el-button type="primary" class="btn" @click="getPdfs()">
           <i class="el-icon-download"></i>下载PDF
         </el-button>
@@ -54,10 +57,6 @@ export default {
           prop: "tonnage",
           label: "下游港口吨位"
         },
-        {
-          prop: "tonnage1",
-          label: "二程船吨位"
-        },
         {
           label: "未到闸船舶",
           children: [
@@ -171,6 +170,9 @@ export default {
     // console.log(this.$refs.excelDom);
   },
   methods: {
+    reflush(){
+      this.$router.go(0);
+    },
     onclick() {
       this.axios
         .post("/api/v1/tms/selectAllShipDynamaics?con=" + this.input)

src/views/statisticalReport/components/tableItem.vue

@@ -624,15 +624,6 @@ export default {
           colspan: _col
         }
       }
-      if (columnIndex === 4) {
-        // this.tableData  修改
-        const _row = this.flitterData(this.tableData).one[rowIndex]
-        const _col = _row > 0 ? 1 : 0
-        return {
-          rowspan: _row,
-          colspan: _col
-        }
-      }
       if (columnIndex === 2) {
         // this.tableData  修改
         const _row = this.flitterData(this.tableData).one[rowIndex]