aa

build/utils.js

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

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8081",
+    // target: "http://192.168.1.106:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/components/DilCommonUI/packages/table/src/table.vue

@@ -225,7 +225,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200, 1000, 50000];
+        return [5,10, 20, 50, 100, 200, 1000, 50000];
       }
     },
     // 每页显示条目个数，支持 .sync 修饰符

src/components/Page/Title/index.vue

@@ -1,12 +1,10 @@
 <template>
-  <div
-    class="page-title"
-    :class="{ 'show-border-buttom': showBorderBottom }"
-    @click="onClickBack"
-  >
-    <i class="el-icon-back" v-if="showIcon"></i>
-    <span>{{ title }}</span>
-    <slot></slot>
+  <div class="page-title" :class="{ 'show-border-buttom': showBorderBottom }">
+    <div style="width:30%" @click="onClickBack">
+      <i class="el-icon-back" v-if="showIcon"></i>
+      <span>{{ title }}</span>
+      <slot></slot>
+    </div>
   </div>
 </template>
 
@@ -24,7 +22,7 @@ export default {
     // 是否显示底部分割线
     showBorderBottom: {
       default: true
-    },
+    }
     //跳转的地址，默认-1(返回上一个页面)
     // BackURL:{
     //   type:String,
@@ -45,7 +43,7 @@ export default {
   height: 3.75rem;
   padding-left: 2.5rem;
   color: #0c2278;
-  background:  #f5f5f5;;
+  background: #f5f5f5;
   line-height: 3;
   font-weight: 800;
   font-size: 1.25rem;

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -198,6 +198,44 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="手动车辆排队" name="fourth">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="queueClick"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -243,6 +281,16 @@ export default {
     this.information();
   },
   methods: {
+    queueClick() {
+      this.axios
+        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message.success("操作成功");
+            this.$router.go(0);
+          }
+        });
+    },
     deleteMoreResult() {
       console.log(this.orderNumber);
       this.axios

src/views/RMS/components/rawWarehouse.vue

@@ -2,15 +2,12 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-       <el-button type="primary" class="btn" @click="toInsert">
+      <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
@@ -18,18 +15,10 @@
       <dilTable v-bind.sync="options">
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="updateWarehouse(scope)"
-            >
+            <el-button type="text" size="small" @click="updateWarehouse(scope)">
               修改
             </el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click="deleteWarehouse(scope)"
-            >
+            <el-button type="text" size="mini" @click="deleteWarehouse(scope)">
               删除
             </el-button>
           </template>
@@ -41,48 +30,48 @@
 
 <script>
 export default {
-  data(){
-    return{
-      inputText:"",
-      options:{
+  data() {
+    return {
+      inputText: null,
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415",
-      },
-    }
+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415"
+      }
+    };
   },
-  methods:{
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=415&con="+this.inputText;
+  methods: {
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getWarehouseList?apiId=415&con=" + this.inputText;
     },
-     toInsert() {
+    toInsert() {
       this.$router.push("/addRawWarehouse");
-
     },
-    updateWarehouse(scope){
-       console.log(scope.row.warehouseId)
-      this.$router.push("/editRawWarehouse/" +scope.row.warehouseId)
+    updateWarehouse(scope) {
+      console.log(scope.row.warehouseId);
+      this.$router.push("/editRawWarehouse/" + scope.row.warehouseId);
     },
-    deleteWarehouse(scope){
+    deleteWarehouse(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
             .post("/api/v1/rms/deleteWarehouse/" + scope.row.warehouseId)
-            .then((res) => {
+            .then(res => {
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
-                  message: "删除成功!",
-                });     
+                  message: "删除成功!"
+                });
                 this.$router.go(0);
               } else {
                 this.$message({
                   message: "删除失败",
-                  type: "warning",
+                  type: "warning"
                 });
               }
             });
@@ -90,23 +79,22 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "删除操作已取消!",
+            message: "删除操作已取消!"
           });
         });
-    },
-    },
+    }
   }
-
+};
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>

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

@@ -1,19 +1,19 @@
 <template>
   <!-- 添加车皮装车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
+    <page-title>返回</page-title>
     <div class="cp">
       <span >车皮号:</span>
       <el-upload style="margin: 8px;"
           class="upload-excel"
           action=""
-          :on-change="importfile"
+          :on-change="importExcel"
           :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
           <el-button  type="primary">导入</el-button>
       </el-upload>
-      <span >当前车皮号数量：{{list.length}}</span>
+      <span >当前导入数量：{{tableData.length}}</span>
       <!-- <el-input
         placeholder="请输入内容"
         v-model="input"
@@ -22,15 +22,83 @@
       >
       </el-input> -->
     </div>
-    <div class="cpList">
+    <!-- <div class="cpList">
       <div class="list">
         <div class="cpList1" v-for="(item, i) in list" :key="i">
           {{ item }}
           <i class="el-icon-close itu" @click="onclick(i)"></i>
         </div>
       </div>
+    </div> -->
+    <div class="table item">
+      <el-table
+        stripe
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+        type="index"
+        width="50"
+        prop="number"
+        label="序号"
+        align="center"
+        fixed="left"
+        :resizable="false">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="materialName"
+          label="物资"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="supplierName"
+          label="发货单位"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="wagonNo"
+          label="车号"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="sendDate"
+          label="发货日期"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="sendStation"
+          label="火车发站"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+        width="180px"
+          prop="arrivalStation"
+          label="火车到站">
+        </el-table-column>
+         <el-table-column
+         align="center"
+        width="180px"
+          prop="weight"
+          label="标重">
+        </el-table-column>
+        <!-- <el-table-column
+        align="center"
+        width="100px"
+          fixed="right"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
     </div>
-    <div class="matching item">
+    <!-- <div class="matching item">
           <span class="text">是否知道采购订单号:</span>
           <el-switch
             v-model="matching"
@@ -54,9 +122,9 @@
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
-    </div>
+    </div> -->
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
+      <!-- <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -71,8 +139,8 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
+      </el-form> -->
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;margin-top:30px">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -185,7 +253,14 @@ export default {
       supplierId: null,
       //物资id
       materialId: null,
+      //表格数据
+      tableData:[],
       unloadPointName:null,
+      //物资集合和供应商映射，相当于本地缓存，减少请求次数
+      materialMap:new Map(),
+      supplierMap:new Map(),
+      materials:[],
+      suppliers:[],
       unloadPointId:null,
       //是否需要打开模态窗口
       drawer: false,
@@ -225,6 +300,9 @@ export default {
       arrivalStationId: 1,
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -423,38 +501,16 @@ export default {
     },
     // 确定
     makeSure() {
-      let state = 0;
-      if (
-        this.list.length > 0 &&
-        this.sendStationId &&
-        this.toTheStationId &&
-        this.form1.resultLoadingDate
-      ) {
-        state = 1;
-      } else {
-        if (this.list.length == 0) {
+      let that=this;
+      if (this.tableData.length <= 0  || !this.toTheStationId || this.form1.resultLoadingDate){
+        if (this.tableData.length <= 0) {
           this.$message({
             type: "warning",
-            message: "请输入车皮号！",
+            message: "请导入数据！",
           });
         } else {
-          if (this.sendStationId) {
             if (this.toTheStationId) {
               if (this.form1.resultLoadingDate) {
-                if (this.supplierId) {
-                  if (this.materialId) {
-                  } else {
-                    this.$message({
-                      type: "warning",
-                      message: "请选择物资",
-                    });
-                  }
-                } else {
-                  this.$message({
-                    type: "warning",
-                    message: "请选择发货单位",
-                  });
-                }
               } else {
                 this.$message({
                   type: "warning",
@@ -467,60 +523,42 @@ export default {
                 message: "请选择到站！",
               });
             }
-          } else {
+        }
+      }
+      //绑定通用字段
+      this.tableData.forEach((row)=>{
+        row.resultType=3;//装车类型为国产矿
+        row.arrivalStationId=that.form1.arrivalStationId;//到站id,默认老区轨道衡
+        row.resultLoadingDate=sjTime(that.form1.resultLoadingDate);//装车日期
+        row.resultRemarks=that.form1.resultRemarks;//备注
+      })
+      console.log(that.tableData);
+      //请求添加
+      this.axios
+        .post("/api/v1/tms/addDomesticLoadResult", that.tableData)
+        .then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
             this.$message({
-              type: "warning",
-              message: "请选择发站！",
+              type: "success",
+              message: "新增成功",
             });
+            this.$router.push("/wagonLoadMine");
           }
-        }
-      }
-      if (state == 1) {
-        let map = {
-          wagonNoList: this.list,
-          sendStationId: this.sendStationId,
-          arrivalStationId: this.toTheStationId,
-          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-          resultRemarks: this.form1.resultRemarks,
-          resultType: 3,
-          sendUnitId: this.supplierId,
-          materialId: this.materialId,
-        };
-        if (this.matching) {
-          map = {
-            wagonNoList: this.list,
-            sendStationId: this.sendStationId,
-            arrivalStationId: this.toTheStationId,
-            resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-            resultRemarks: this.form1.resultRemarks,
-            resultType: 3,
-            sendUnitId: this.supplierId,
-            materialId: this.materialId,
-            purchaseOrderRailPlanId: this.purchaseOrderId,
-          };
-        }
-        this.axios
-          .post("/api/v1/tms/addDomesticLoadResult", map)
-          .then((res) => {
-            console.log(res);
-            if (res.data.code == "200") {
-              this.$message({
-                type: "success",
-                message: "新增成功",
-              });
-              this.$router.push("/wagonLoadMine");
-            }
-          });
-      }
+        });
+      
     },
     cancel() {
       this.$router.push("/wagonLoadMine");
     },
-    // excel表上传
-    importfile(file) {//导入文件
+    // 导入excel
+    importExcel(file) {
       let that=this;
       if (!file) {
-        alert('文件错误，请重新选择');
+        that.$message({
+          message: "文件错误!",
+          type: "warning",
+        });
         return
         }
         var reader = new FileReader();
@@ -533,60 +571,45 @@ export default {
           workbook= XLSX.read(data, {
               type: 'binary'
           });
-          console.log(workbook.SheetNames.length);
+          console.log(workbook);
           //读取表格
           let rows= XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]]);//只取第一页
           console.log(rows);
-          //绑定品名和发货单位
+          //清空
           if(rows.length>0){
-            that.list=[];
-            that.materialName=rows[0]['品  名'];
-            that.supplierName=rows[0]['发货单位'];
-            that.setIdForName();
+            that.tableData=[];
+            if((typeof rows[0]['车号'])=='undefined'){
+              that.$message({
+                message: "导入Excel格式错误!",
+                type: "warning",
+              });
+              return;
+            }
           }
-          //绑定车号
+          //绑定数据
           rows.forEach((row,index) => {
             let carNumber=row['车号'];
-            if((typeof carNumber)!="undefined" && carNumber.length > 6)
-              that.list.push(carNumber);
-            else
-              console.log(carNumber+"不符合格式");
-          });
-        };
-        reader.readAsBinaryString(file.raw); //以二进制方式读取
-    },
-    //导入的时候为品名和发货单位绑定id
-    setIdForName(){
-      let that=this;
-      //绑定品名id
-      that.axios.post("/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          that.materialName).then((res)=>{
-            console.log(res.data.data);
-            if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
-              that.materialId=res.data.data.list[0].materialId;
-              that.materialName=res.data.data.list[0].materialName;
-            }else{
-              that.materialId=null;
-              that.materialName=null;
-              this.$message.error("绑定品名失败，请手动选择！");
+            if((typeof carNumber)!="undefined" && carNumber.length > 6){
+              //表格数据
+              let temp={
+                number:row['序号'],
+                materialName:row['品  名'],
+                supplierName:row['发货单位'],
+                sendDate:row['发货日期'],
+                sendStation:row['发站'],
+                arrivalStation:row['到站'],
+                wagonNo:row['车号'],
+                weight:row['标重']
+              }
+              that.tableData.push(temp);
             }
-            
-      });
-      //绑定发货单位id
-      that.axios.post("/api/v1/uc/getSupplierMesByMaterialId?apiId=247&index=" +
-          that.supplierName).then((res)=>{
-            console.log(res.data.data);
-            if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
-              that.supplierId=res.data.data.list[0].supplierId;
-              that.supplierName=res.data.data.list[0].supplierName;
-            }else{
-              that.supplierId=null;
-              that.supplierName=null;
-              this.$message.error("绑定发货单位失败，请手动选择！");
+            else{
+              console.log("车号"+carNumber+"不是7位数!");
             }
-      });
+        });
+        };
+        reader.readAsBinaryString(file.raw); //以二进制方式读取
     }
-
   },
 };
 </script>
@@ -752,11 +775,13 @@ export default {
   .button_box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    margin-top: 30px;
+    margin-bottom: 30px;
   }
    .fromOther  .el-input__inner{
     width: 250px;
   }
+ 
 }
 </style>
 

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

@@ -10,7 +10,7 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
       <el-button type="primary" @click="btnclick(1)">
-        <i class="el-icon-edit-outline"></i>补录
+        <i class="el-icon-edit-outline"></i>配单
       </el-button>
     </div>
 

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

@@ -1,44 +1,44 @@
 <template>
   <div class="wagonLoadbu">
     <page-title>返回</page-title>
-    <div class="top">
-      <div class="text">物资：</div>
-      <el-select
-        v-model="materialId"
-        filterable
-        remote
-        reserve-keyword
-        placeholder="选择物资名"
-        :remote-method="searchMaterialName"
-        @change="searchSupplierName();getPurchaseOrderNo()">
-        <el-option
-          v-for="item in materialNames"
-          :key="item.materialId"
-          :label="item.materialName"
-          :value="item.materialId">
-        </el-option>
-      </el-select>
-      <div class="text">发货单位：</div>
-       <el-select
-        v-model="supplierId"
-        filterable
-        remote
-        reserve-keyword
-        placeholder="选择发货单位"
-        :remote-method="searchSupplierName"
-        @change="getPurchaseOrderNo();supplierIdChange()">
-        <el-option
-          v-for="item in supplierNames"
-          :key="item.supplierId"
-          :label="item.supplierName"
-          :value="item.supplierId">
-        </el-option>
-      </el-select>
-    </div>
-    <div class="wagonLoadbu_table">
+     <div class="purchaseOrder_table">
+      <div class="search" style="display:flex">
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>物资名或订单号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="search1"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>外轮船名：</el-label>
+        </div>
+        <el-input
+          placeholder="请输入"
+          v-model="search2"
+          style="margin: 10px;width:10%"
+          clearable
+        ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchOrder()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button 
+      type="primary"
+      class="btn" 
+      @click="makeSure" 
+      style="margin: 10px;">确认配单
+      </el-button>
+      </div>
+      <!-- 采购订单号 -->
       <dilTable
-        v-bind.sync="option"
-        @selection-change="selectionChange"
+        v-bind.sync="purchaseOption"
+        @radio-change="orderChange"
       ></dilTable>
     </div>
     <!-- <div class="material form">
@@ -51,7 +51,7 @@
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-    </div> -->
+    </div>
     <div class="forwardingUnit form">
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
@@ -62,18 +62,22 @@
       <el-input v-model="remark" @blur="onBlur" > </el-input>
       <span class="span"></span>
     </div>
-
     <div class="form">
       <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
+    </div> -->
+    <!--待补录表格-->
+    <div class="wagonLoadbu_table">
+      <dilTable
+        v-bind.sync="option"
+        @selection-change="selectionChange"
+        @row-click="selectionChange"
+      ></dilTable>
     </div>
-    <div class="button_box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
+    
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+    <!-- <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
@@ -106,7 +110,7 @@
           @radio-change="currentRadioChange3"
         ></dilTable>
       </div>
-    </el-drawer>
+    </el-drawer> -->
   </div>
 </template>
 
@@ -117,12 +121,24 @@ export default {
   data() {
     return {
       form1: {},
+      con:null,
+      purchaseOption:{
+         // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/findPurchaseOrderList?apiId=81",
+        // 控制选择单列
+        selectionType: "radio",
+        pageSize:5,
+      },
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10",
         // 控制显示多选列
-        selectionType: "select"
+        selectionType: "select",
+        pageSize:10,
       },
+      //查询用数据
+      search1:null,
+      search2:null,
       //多选选中的数据
       selecTionListMap: [],
       //船名
@@ -142,6 +158,7 @@ export default {
       //发货单位选项
       supplierNames:[],
       //卸货点
+      unloadPointId:null,
       unloadPointName:null,
       //是否需要打开模态窗口
       drawer: false,
@@ -173,23 +190,30 @@ export default {
     makeSure() {
       if(this.selecTionListMap.length <= 0){
         this.$message({
-          message: "请选择需要补录的装车信息!",
+          message: "请选择需要配单的装车信息!",
           type: "warning",
         });
-      }else{
+      }else if(!this.purchaseOrderId){
+         this.$message({
+          message: "请选择采购订单!",
+          type: "warning",
+        });
+      }
+      else{
         let map = {
           resultIdList:this.selecTionListMap,
-          purchaseOrderId:this.purchaseOrderId,
-          insertUpdateRemark: this.form1.insertUpdateRemark
+          purchaseOrderId:this.purchaseOrderId
         }
+        let that=this;
         this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
           console.log(res.data.data)
           if(res.data.code == "200"){
             this.$message({
-              message: "补录成功!",
+              message: "配单成功!",
               type: "success",
             });
-            this.cancel();
+            that.tableChange();
+            // this.cancel();//不退出
           }
         })
       }
@@ -199,6 +223,17 @@ export default {
     cancel() {
       this.$router.push("/wagonLoadMine");
     },
+    //采购订单表格选中
+    orderChange(selection){
+      console.log(selection);
+      this.purchaseOrderId=selection.purchaseOrderId;
+      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.materialId=selection.materialId;
+      this.materialName=selection.materialName;
+      this.supplierId=selection.supplierId;
+      this.supplierName=selection.supplierName;
+      this.remark=selection.resultForeignShipName;
+    },
     //表格选中
     selectionChange(selection) {
       this.selecTionListMap = [];
@@ -264,6 +299,22 @@ export default {
         });
       }
     },
+    searchOrder(){
+      //查询订单
+      if((typeof this.search1)!="undefined" && (typeof this.search2)!='undefined'){
+        let requestUrl="/api/v1/tms/findPurchaseOrderList?apiId=81";
+        if(this.search1!=null){
+            requestUrl+=("&materialName="+this.search1);
+        }
+        if(this.search2!=null){
+            requestUrl+=("&resultForeignShipName="+this.search2);
+        }
+        this.purchaseOption.requestUrl=requestUrl;
+      }else{
+        this.purchaseOption.requestUrl=
+        "/api/v1/tms/findPurchaseOrderList?apiId=81"
+      }
+    },
     onClick(a) {
       if (a == 1) {
         this.frist.requestUrl =
@@ -281,6 +332,7 @@ export default {
       }
     },
     searchMaterialName(index=''){
+      //根据name查询物资名
       let that=this;
       that.axios.post("api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index="+index).then((res)=>{
           console.log(res);
@@ -293,6 +345,7 @@ export default {
       });
     },
     searchSupplierName(index=''){
+      //根据name查询发货单位
       let that=this;
       that.axios.post("/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId="+that.materialId+"&index="+index).then((res)=>{
            console.log(res);
@@ -303,11 +356,9 @@ export default {
           }
       });
     },
-    supplierIdChange(){
-      this.option.requestUrl=
-      "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10&materialId="
-      +this.materialId+"&supplierId="
-      +this.supplierId;
+    tableChange(){
+      //刷新表格
+      this.option.requestUrl="/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10&i="+new Date();
     }
   },
 };
@@ -474,7 +525,7 @@ export default {
   .button_box {
     display: flex;
     justify-content: center;
-    margin-top: 30px;
+    margin: 30px;
   }
 }
 </style>

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
       direction: "rtl",
       input: "",
       options: {
-        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
+        requestUrl: "/api/v1/tms/getBatchListForInstruction?apiId=383",
         selectionType: "radio",
         maplist: []
       },
@@ -72,7 +72,7 @@ export default {
     },
     onclick() {
       this.options.requestUrl =
-        "/api/v1/tms/getBatchList?apiId=383&con=" + this.input;
+        "/api/v1/tms/getBatchListForInstruction?apiId=383&con=" + this.input;
     },
     currentRadioChange1(selection) {
       this.maplist = selection;

src/views/TMS/components/importedShip/instructionsCapacity.vue

@@ -87,6 +87,7 @@ export default {
         .get("/api/v1/uc/getCapacityTel?capacityId=" + item.capacityId)
         .then(res => {
           console.log(res.data);
+          this.capacityIds = "";
           if (res.data) {
             this.$set(this.form, "instructionContactInf", res.data.capacityTel);
           }

src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -291,6 +291,9 @@ export default {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
+      } else if (this.orderType == null) {
+        this.$message.error("请选择订单类型");
+        return;
       }
       this.axios
         .post("/api/v1/oms/addPurInwardOrder", {

src/views/inward/components/truckOrder/addPurInwardOrderCon.vue

@@ -280,6 +280,9 @@ export default {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
+      } else if (this.orderType == null) {
+        this.$message.error("请选择订单类型");
+        return;
       }
       this.axios
         .post("/api/v1/oms/addPurInwardOrder", {

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

@@ -3,6 +3,23 @@
   <div class="sale">
     <div class="top">
       <el-form :inline="true" style="margin-top: 1rem;">
+        <el-form-item>
+          <el-input
+            v-model="capacityNo"
+            style="width:250px"
+            placeholder="输入车牌号查询"
+            clearable
+          >
+          </el-input>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclick"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询车辆</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -15,7 +32,7 @@
         </el-form-item>
         <el-form-item
           ><el-button type="primary" class="btn" @click="refresh">
-            <i class="el-icon-d-arrow-right"></i>刷新
+            <i class="el-icon-refresh"></i>刷新
           </el-button></el-form-item
         >
         <el-form-item
@@ -398,12 +415,20 @@ export default {
         });
     },
     onclick() {
+      console.log("我到了这里");
+      console.log(this.capacityNo);
       if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0?capacityNumber=" +
-          this.capacityNo +
-          "&i=" +
-          new Date();
+        this.axios
+          .post(
+            "/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=" +
+              new Date() +
+              "&capacityNumber=" +
+              this.capacityNo
+          )
+          .then(res => {
+            this.tableData1 = res.data.data;
+          });
+        console.log("wzxxx");
       } else {
         this.axios
           .post(
@@ -454,7 +479,12 @@ export default {
         return;
       }
       for (let i = 0; i < this.maplist.length; i++) {
-        if (typeof this.maplist[i].id == "undefined") {
+        console.log(typeof this.maplist[i].id);
+        if (
+          typeof this.maplist[i].id == "undefined" ||
+          this.maplist[i].id == null ||
+          this.maplist[i].id == "null"
+        ) {
           this.$message.error("请选择装货点");
           return;
         }

src/views/statisticalReport/components/inwardReport/allInwardReport.vue

@@ -33,6 +33,12 @@
         <el-tab-pane label="厂外-厂内内转报表" name="fifth"
           ><dilTable ref="excelDom" v-bind.sync="fifth"></dilTable
         ></el-tab-pane>
+        <el-tab-pane label="拼装车辆进厂统计" name="six"
+          ><dilTable ref="excelDom" v-bind.sync="six"></dilTable
+        ></el-tab-pane>
+        <el-tab-pane label="一焦化采购进厂" name="seven"
+          ><dilTable ref="excelDom" v-bind.sync="seven"></dilTable
+        ></el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -53,8 +59,14 @@ export default {
       purInward: [],
       //销售内转数据
       saleReport: [],
+      //采购燃料统计报表
       purReport: [],
+      //厂外-厂内统计报表
       outFactory: [],
+      //拼装车辆统计报表
+      assembleReport: [],
+      //一焦化-厂内统计报表
+      oneCokeReport: [],
       input: null,
       activeName: "first",
       startTime: null,
@@ -73,6 +85,12 @@ export default {
       },
       fifth: {
         requestUrl: ""
+      },
+      six: {
+        requestUrl: ""
+      },
+      seven: {
+        requestUrl: ""
       }
     };
   },
@@ -261,6 +279,54 @@ export default {
               loading.close();
             }, 2000);
           });
+      } else if (this.activeName == "six") {
+        this.axios
+          .post(
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&index=" +
+              this.input +
+              "&orgCode=" +
+              orgCode +
+              "&orderType=15"
+          )
+          .then(res => {
+            this.totalArr = [];
+            this.assembleReport = [];
+            this.tableTitle = "拼装车皮进厂统计报表";
+            this.assembleReport = res.data.data;
+            this.totalArr = this.totalArr.concat(this.assembleReport);
+            this.exportAllReportToExcel();
+            setTimeout(() => {
+              loading.close();
+            }, 2000);
+          });
+      } else if (this.activeName == "seven") {
+        this.axios
+          .post(
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&index=" +
+              this.input +
+              "&orgCode=" +
+              orgCode +
+              "&orderType=16"
+          )
+          .then(res => {
+            this.totalArr = [];
+            this.oneCokeReport = [];
+            this.tableTitle = "一焦化-进厂统计报表";
+            this.oneCokeReport = res.data.data;
+            this.totalArr = this.totalArr.concat(this.oneCokeReport);
+            this.exportAllReportToExcel();
+            setTimeout(() => {
+              loading.close();
+            }, 2000);
+          });
       }
     },
     openFullScreen() {
@@ -357,11 +423,49 @@ export default {
                             this.totalArr = this.totalArr.concat(
                               this.outFactory
                             );
-                            this.tableTitle = "全部内转车辆报表";
-                            this.exportAllReportToExcel();
-                            setTimeout(() => {
-                              loading.close();
-                            }, 2000);
+                            this.axios
+                              .post(
+                                "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                                  startTime +
+                                  "&endTime=" +
+                                  endTime +
+                                  "&orderType=15" +
+                                  "&index=" +
+                                  this.input +
+                                  "&i=" +
+                                  new Date()
+                              )
+                              .then(res => {
+                                this.assembleReport = [];
+                                this.assembleReport = res.data.data;
+                                this.totalArr = this.totalArr.concat(
+                                  this.assembleReport
+                                );
+                                this.axios
+                                  .post(
+                                    "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                                      startTime +
+                                      "&endTime=" +
+                                      endTime +
+                                      "&orderType=16" +
+                                      "&index=" +
+                                      this.input +
+                                      "&i=" +
+                                      new Date()
+                                  )
+                                  .then(res => {
+                                    this.oneCokeReport = [];
+                                    this.oneCokeReport = res.data.data;
+                                    this.totalArr = this.totalArr.concat(
+                                      this.oneCokeReport
+                                    );
+                                    this.tableTitle = "全部内转车辆报表";
+                                    this.exportAllReportToExcel();
+                                    setTimeout(() => {
+                                      loading.close();
+                                    }, 2000);
+                                  });
+                              });
                           });
                       });
                   });
@@ -445,6 +549,18 @@ export default {
                             this.totalArr = this.totalArr.concat(
                               this.outFactory
                             );
+                            this.axios
+                              .post(
+                                "/api/v1/tms/getInwardReportForAssemble?apiId=477&startTime=" +
+                                  startTime +
+                                  "&endTime=" +
+                                  endTime +
+                                  "&index=" +
+                                  this.input +
+                                  "&orgCode=" +
+                                  getCookie("orgCode")
+                              )
+                              .then(res => {});
                             this.tableTitle = "全部内转车辆报表";
                             this.exportAllReportToExcel();
                             setTimeout(() => {
@@ -512,6 +628,14 @@ export default {
           null +
           "&i=" +
           new Date();
+        this.six.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orderType=15";
+        this.seven.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orderType=16";
       } else {
         this.first.requestUrl =
           "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
@@ -538,6 +662,18 @@ export default {
           getCookie("orgCode") +
           "&i=" +
           new Date();
+        this.six.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orgCode=" +
+          getCookie("orgCode") +
+          "&orderType=15";
+        this.seven.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orgCde=" +
+          getCookie("orgCode") +
+          "&orderType=16";
       }
     },
     onClick() {
@@ -613,6 +749,28 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (this.activeName == "six") {
+          this.six.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orderType=15";
+        } else if (this.activeName == "seven") {
+          this.seven.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orderType=16";
         }
       } else {
         if (this.activeName == "first") {
@@ -675,6 +833,32 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (thia.activeName == "six") {
+          this.six.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orgCode=" +
+            getCookie("orgCode") +
+            "&orderType=15";
+        } else if (thia.activeName == "seven") {
+          this.seven.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orgCode=" +
+            getCookie("orgCode") +
+            "&orderType=16";
         }
       }
     },