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

build/utils.js

@@ -20,6 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 let devModules = ["all"];
+//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

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: {
@@ -74,8 +74,8 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
+    //target: "http://172.16.33.166:80",
     target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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

@@ -0,0 +1,188 @@
+//补录批次id
+<template>
+  <div class="recordBathch">
+     <div class="purchaseOrder_table">
+      <div class="search" style="display:flex">
+      <el-input
+        placeholder="物资名"
+        v-model="materialName"
+        style="margin-top: 10px; margin-left: 20px; width: 150px"
+        clearable
+      >
+       </el-input>
+       <el-input
+        placeholder="外轮船名"
+        v-model="resultForeignShipName"
+        style="margin-top: 10px; margin-left: 20px; width: 150px"
+        clearable
+      >
+       </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchNotice()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
+      <!-- 未绑定金蝶的发货通知及其批次 -->
+      <dilTable
+        v-bind.sync="noticeOption"
+      >
+      <el-table-column
+      fixed="right"
+      label="操作"
+      width="70">
+      <template slot-scope="scope">
+          <el-button
+            @click.native.prevent="ondrawer(scope.row)"
+            type="text"
+            size="small">
+            关联订单
+          </el-button>
+        </template>
+      </el-table-column>
+      </dilTable>
+      </div>
+    
+    <!-- 模态框 -->
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="50%"
+    >
+      <el-input
+        placeholder="物资名或外轮船名"
+        v-model="inputText"
+        style="margin-top: 10px; margin-left: 20px; width: 200px"
+        clearable
+      >
+       </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onClick"
+        style="margin-bottom: 15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="makeSure"
+        style="margin-bottom: 15px">
+        确认绑定
+      </el-button>
+      <div v-show="drawer">
+        <dilTable
+        ref="ordertable"
+          v-bind.sync="purchaseOption"
+          @radio-change="orderChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import {getCookie} from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      purchaseOption:{
+        requestUrl: "/api/v1/tms/getBatchIdByForeign?apiId=489",
+        selectionType: "radio"
+      },
+      noticeOption: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/findBatchForBind?apiId=489"
+      },
+      //物资名称
+      materialName:'',
+      //外轮船名
+      resultForeignShipName:'',
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      inputText: null,
+      row:null,
+      order:null,
+    };
+  },
+  mounted(){
+  },
+  methods: {
+    //确定
+    makeSure() {
+      if(this.row!=null && this.order!=null){
+        let map = {
+          batchInfactoryId:this.row.batchInfactoryId,
+          batchIdOld:this.row.batchId,
+          batchId:this.order.batchId,
+          gmId:this.row.gmId,
+          portId:this.row.portId,
+          userId:getCookie("userId")
+        }
+        console.log(map);
+        this.axios.post('/api/v1/tms/bindBatch',map).then((res)=>{
+          console.log(res.data)
+          if(res.data.code == "200"){
+            this.$message({
+              message: "绑定成功!",
+              type: "success",
+            });
+            //刷新表格
+            this.searchNotice();
+            //关闭抽屉
+            this.drawer=false;
+          }
+        })
+      }else{
+        this.$message.warning("请选择采购订单!");
+      }
+      
+    },
+    //采购订单表格选中
+    orderChange(selection){
+        console.log("order:",selection);
+        this.order=selection;
+    },
+
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+    },
+    ondrawer(row) {
+      this.drawer = true;
+      this.row=row;
+      this.inputText=row.foreignShipName;
+      console.log("row:",row);
+      this.purchaseOption.requestUrl =
+          "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.inputText;
+    },
+    searchNotice(){
+      //查询发货通知
+        this.noticeOption.requestUrl=
+        "/api/v1/tms/findBatchForBind?apiId=489"+"&materialName="+this.materialName
+        +"&foreignShipName="+this.resultForeignShipName
+        +"&i="+new Date();
+    },
+    onClick() {
+        this.purchaseOption.requestUrl =
+          "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.inputText;
+    },
+    handleClose(done) {
+        this.row=null;
+        done();
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+
+</style>

src/views/TMS/router/index.js

@@ -139,6 +139,7 @@ import updateUnloadShip from "../components/importedShip/updateUnloadShip.vue";
 import updateWaterQuality from "../components/importedShip/updateWaterQuality.vue";
 import updateLoadShip from "../components/importedShip/updateLoadShip.vue";
 import waterQuality from "../components/importedShip/waterQuality.vue";
+import recordBatch from "../components/importedShip/recordBatch.vue";
 
 import assignmentPlan from "../components/importedTruck/assignmentPlan.vue";
 import breakdownPlan from "../components/importedTruck/breakdownPlan.vue";
@@ -963,6 +964,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: waterQuality
       },
+      {
+        path: "recordBatch",
+        name: "recordBatch",
+        meta: { code: "xtpzgl-yhgl" },
+        component: recordBatch
+      },
       {
         path: "updateLoadShip/:resultId",
         name: "updateLoadShip",

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

@@ -166,6 +166,8 @@
         border
         style="width: 100%"
         highlight-current-row
+        ref="materialTableTop"
+        id="table"
       >
         <el-table-column
           v-for="(item, i) in materialTableTop"
@@ -185,6 +187,10 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
+                  :id="'input' + scope.$index"
+                  @keyup.up.native="clicks(scope.$index)"
+                  @keyup.down.native="clickx(scope.$index)"
+                  @keyup.enter.native="singleDistribute"
                 ></el-input>
               </template>
               <!-- 米数 -->
@@ -308,12 +314,19 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="changeMaterial(scope.$index)"
-                  v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                <!--更改-->
+                <i class="el-icon-edit"
+                   @click="changeMaterial(scope.$index)"
+                   style="font-size: 20px"
+                   v-if="isCellClick == 1"></i>
+              </template>
+              <!--规格型号-->
+              <template v-if="item.prop == 'Specification'">
+                <el-input
+                  style="width: 120px"
+                  class="textinput"
+                  v-model.number="scope.row.Specification"
+                ></el-input>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -358,12 +371,12 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                <!--增加-->
+                <i class="el-icon-folder-add"
+                   @click="ondrawer(scope.row, scope.$index)"
+                   v-if="isCellClick == 1"
+                   style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货日期 -->
               <!-- <template v-if="item.prop == 'saleDateOfReceipt'">
@@ -399,7 +412,7 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column fixed="right" label="操作" width="200" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -421,7 +434,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -887,7 +900,8 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140px"
+          width: "140px",
+          slot: true
         },
         {
           prop: "orderPlanWeight",
@@ -946,7 +960,9 @@ export default {
       ignoreSaleOrderConsigneeTel: 0,
       restaurants: [],
       saleAreaId: null,
-      isNiTui: 0
+      isNiTui: 0,
+      datalistindex: 0,
+      temporarylist:[],
     };
   },
   created() {
@@ -1916,6 +1932,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est=/\d{11}/g
+      var string2=this.place.match(est)
+      console.log("-----------这是抓取到的数据----------")
+      console.log(string2)
+      if (string2 != null){
+        for(i=0;i<string2.length;i++){
+          var reg=/^1[3456789]\d{9}$/
+          if(reg.test(string2[i])){
+            this.saleOrderConsigneeTel=string2
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;
@@ -1969,7 +1999,7 @@ export default {
       }
     },
     // 确定
-    makeSure() {
+    async makeSure() {
       if (this.selectionList.length == 0) {
         this.$message.warning("请先填写具体信息");
         return;
@@ -1981,6 +2011,18 @@ export default {
           i++;
         }
       });
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryFormat",this.selectionList)
+        .then(res=>{
+          if (res.data.code=="500"){
+            flag=1
+          }
+        })
+      if (flag== 1){
+        this.$message.error("规格型号有问题，请重新输入");
+        return;
+      }
       if (i != 0) {
         this.$message.error("件数必填且请输入正整数");
         return;
@@ -2017,10 +2059,31 @@ export default {
       this.orderMakeSure = true;
     },
     //发送请求
-    sendRequest() {
+    async sendRequest() {
       this.orderMakeSure = false;
       //是否还有件数未填写
       var orderPlanWeightAllFill = 0;
+      //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
+      //先把暂存区的数据清空
+      this.temporarylist=[]
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+        .then(res=>{
+          if (res.data.code === "500"){
+            flag=1
+          }
+          console.log(res.data.code)
+          //给暂存区的数据赋值
+          this.temporarylist=res.data.data
+          console.log("以下是查询出来的数据")
+          console.log(res.data.data)
+        })
+      if (flag===1){
+        this.$message.error("规格型号不对")
+        return
+      }
+      this.selectionList=this.temporarylist
       //初始化maplist
       var mapList = [];
       this.selectionList.forEach(item => {
@@ -2105,6 +2168,44 @@ export default {
           done();
         })
         .catch(_ => {});
+    },
+    //点击事件（上）
+    clicks(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      console.log('clicks=e',arguments);
+      if (index==0){
+        console.log("向上1")
+        //this.datalistindex=this.materialTableTop.length-1
+        document.getElementById("input" + (this.materialList.length-1)).focus()
+      }else {
+        console.log("向上2")
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
+        document.getElementById("input" + (index-1)).focus()
+      }
+
+    },
+    //点击事件(下)
+    clickx(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      if (index ==this.materialList.length-1){
+        console.log("向下1")
+        document.getElementById("input" + 0).focus()
+      }else {
+        console.log("向下2")
+        //this.datalistindex+=1
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
+        //var tbl=document.getElementById("table").childNodes[0]
+        //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
+        //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
+          //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //console.log(rowlist)
+        var nextInput = document.getElementById("input" + (index + 1));
+        nextInput.focus()
+      }
     }
   }
 };

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

@@ -183,6 +183,10 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
+                  :id="'input'+scope.$index"
+                  @keyup.up.native="clicks(scope.$index)"
+                  @keyup.down.native="clickx(scope.$index)"
+                  @keyup.enter.native="createACar"
                 ></el-input>
               </template>
               <!-- 米数 -->
@@ -308,12 +312,11 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="changeMaterial(scope.$index)"
-                  v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                <!--更改-->
+                <i class="el-icon-edit"
+                   @click="changeMaterial(scope.$index)"
+                   style="font-size: 20px"
+                   v-if="isCellClick == 1"></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -322,6 +325,14 @@
                   v-model.number="scope.row.orderPlanWeight"
                 ></el-input>
               </template>
+              <!--规格型号-->
+              <template v-if="item.prop=='Specification'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.Specification"
+                  style="width:120px"
+                ></el-input>
+              </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
                 <el-input
@@ -358,12 +369,12 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                <!--增加-->
+                <i class="el-icon-folder-add"
+                   @click="ondrawer(scope.row, scope.$index)"
+                   v-if="isCellClick == 1"
+                   style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货客户电话号码 -->
               <template v-if="item.prop == 'saleOrderConsigneeTel'">
@@ -389,7 +400,8 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column fixed="right" label="操作" width="200"
+                         v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -411,7 +423,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -705,7 +717,7 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140"
+          width: "140",
         },
         {
           prop: "orderPlanWeight",
@@ -841,7 +853,8 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140"
+          width: "140",
+          slot: true
         },
         {
           prop: "orderPlanWeight",
@@ -898,7 +911,9 @@ export default {
       //收款公司
       saleOrderReceiveCustomer: null,
       //是否忽视收货客户电话字段
-      ignoreSaleOrderConsigneeTel: 0
+      ignoreSaleOrderConsigneeTel: 0,
+      //暂时存取的数据
+      temporarylist: [],
     };
   },
   created() {
@@ -1816,6 +1831,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est=/\d{11}/g
+      var string2=this.place.match(est)
+      console.log("-----------这是抓取到的数据----------")
+      console.log(string2)
+      if (string2 != null){
+        for(i=0;i<string2.length;i++){
+          var reg=/^1[3456789]\d{9}$/
+          if(reg.test(string2[i])){
+            this.saleOrderConsigneeTel=string2
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;
@@ -1873,7 +1902,7 @@ export default {
       }
     },
     // 确定
-    makeSure() {
+    async makeSure() {
       if (this.selectionList.length == 0) {
         this.$message.warning("请先填写具体信息");
         return;
@@ -1885,6 +1914,20 @@ export default {
           i++;
         }
       });
+      let s=0
+      //确认规格型号格式是否正确
+      await this.axios
+        .post("/api/v1/ams/queryFormat",this.selectionList)
+        .then(res=>{
+          if (res.data.code=="500"){
+            s=1
+          }
+        })
+      console.log("这是获取到的数据")
+      if (s== 1){
+        this.$message.error("规格型号有问题，请重新输入");
+        return;
+      }
       if (i != 0) {
         this.$message.error("件数必填且请输入正整数");
         return;
@@ -1920,8 +1963,37 @@ export default {
       });
       this.orderMakeSure = true;
     },
+    async getlist(){
+      let res=await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+      this.selectionList=res.data.data
+      console.log("这是查询出来的")
+      console.log(res.data.data)
+      console.log("这是修改后的数据")
+      console.log(this.selectionList)
+    },
     //发送请求
-    sendRequest() {
+    async sendRequest() {
+      //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
+      //先把暂存区的数据清空
+      this.temporarylist=[]
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+        .then(res=>{
+          if (res.data.code === "500"){
+            flag=1
+          }
+          console.log(res.data.code)
+          //给暂存区的数据赋值
+          this.temporarylist=res.data.data
+          console.log("以下是查询出来的数据")
+          console.log(res.data.data)
+        })
+      if (flag===1){
+        this.$message.error("规格型号不对")
+        return
+      }
       //先调删除订单接口
       this.axios
         .post(
@@ -1934,8 +2006,10 @@ export default {
             //是否还有件数未填写
             var orderPlanWeightAllFill = 0;
             //初始化maplist
+            this.selectionList=this.temporarylist
+            console.log("以下是修改过后的数据")
+            console.log(this.selectionList)
             var mapList = [];
-            console.log(this.selectionList);
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {
                 orderPlanWeightAllFill++;
@@ -2013,8 +2087,45 @@ export default {
         })
         .catch(_ => {});
     },
+    CloseClick() {},
+    //点击事件（上）
+    clicks(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      console.log('clicks=e',arguments);
+      if (index==0){
+        console.log("向上1")
+        //this.datalistindex=this.materialTableTop.length-1
+        document.getElementById("input" + (this.materialList.length-1)).focus()
+      }else {
+        console.log("向上2")
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
+        document.getElementById("input" + (index-1)).focus()
+      }
 
-    CloseClick() {}
+    },
+    //点击事件(下)
+    clickx(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      if (index ==this.materialList.length-1){
+        console.log("向下1")
+        document.getElementById("input" + 0).focus()
+      }else {
+        console.log("向下2")
+        //this.datalistindex+=1
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
+        //var tbl=document.getElementById("table").childNodes[0]
+        //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
+        //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
+        //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //console.log(rowlist)
+        var nextInput = document.getElementById("input" + (index + 1));
+        nextInput.focus()
+      }
+    }
   }
 };
 </script>

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -40,7 +40,10 @@
       <span class="motext">批次</span>
       <el-input class="moinput" v-model="batchIds" disabled> </el-input>
       <el-button class="mobutton" type="primary" @click="ondrawer(5)"
-        >浏览</el-button
+        >选批次</el-button
+      >
+      <el-button class="mobutton" type="primary" @click="ondrawer(6)"
+        >录批次</el-button
       >
     </div>
     <div class="form">
@@ -82,7 +85,7 @@
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        style="margin-top: 10px; margin-left: 20px; width: 200px"
         clearable
       >
       </el-input>
@@ -94,6 +97,21 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-input
+       v-show="a == 6"
+        placeholder="请输入外轮船名"
+        v-model="foreignShipName"
+        style="width: 200px"
+        clearable
+      ></el-input>
+      <el-button
+      v-show="a == 6"
+        type="primary"
+        class="btn"
+        @click="handleClose"
+        style="margin-bottom: 15px"
+      >确定
+      </el-button>
       <!-- <div v-show="a == 4">
         <dilTable v-bind.sync="options" @radio-change="currentRadioChange6"></dilTable>
       </div> -->
@@ -127,6 +145,12 @@
           @radio-change="currentRadioChange5"
         ></dilTable>
       </div>
+      <div v-show="a == 6">
+        <dilTable
+          v-bind.sync="second6"
+          @radio-change="currentRadioChange6"
+        ></dilTable>
+      </div>
     </el-drawer>
     <el-form
       :inline="true"
@@ -225,7 +249,11 @@ export default {
         selectionType: "radio",
         mapList5: [],
       },
-
+      second6: {
+        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244",
+        selectionType: "radio",
+      },
+      foreignShipName:null,
       value: undefined,
       value2: undefined,
       value4: undefined,
@@ -350,7 +378,17 @@ export default {
         (this.batchIds =
           selection.foreignShipName + "" + selection.materialName);
     },
-
+    currentRadioChange6(selection) {
+      this.second5.mapList5 = selection;
+      console.log("selection",selection);
+    },
+    checkForeignShipName(){
+      if(this.foreignShipName==null || this.foreignShipName==''){
+        this.$message.warning("请输入外轮船名!");
+        return false;
+      }
+      return true;
+    },
     onchange(val) {},
 
     onclick(a) {
@@ -367,10 +405,25 @@ export default {
       } else if (a == 5) {
         this.second5.requestUrl =
           "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.input;
+      }else if(a == 6){
+          this.second6.requestUrl = 
+          "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
       }
     },
-
+    //关闭模态框窗口
     handleClose(done) {
+      if(this.a==6){
+        //校验外轮船名和批次
+        if(!this.checkForeignShipName()){
+          return;
+        }else if(this.second5.mapList5.length == 0){
+          this.$message.warning("请选择物资!");
+          return;
+        }
+        this.batchIds = this.foreignShipName + "" + this.second5.mapList5.materialName;
+        this.second5.mapList5.foreignShipName = this.foreignShipName;
+      }
+      this.drawer=false;
       done();
     },
 
@@ -439,7 +492,7 @@ export default {
         sulfurcontent: this.form1.sulfurcontent,
         userId: getCookie("userId"),
       };
-
+      
       //判断放货数量是否为数字
       if (
         map.noticeCommerceMethod == null ||

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

@@ -128,6 +128,8 @@
             </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="物资件数">
@@ -183,6 +185,8 @@
             </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="物资件数">
@@ -432,7 +436,6 @@ export default {
         columnIndex === 0 ||
         columnIndex === 1 ||
         columnIndex === 2 ||
-        columnIndex === 7 ||
         columnIndex === 8 ||
         columnIndex === 9 ||
         columnIndex === 10 ||

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -386,6 +386,7 @@ export default {
       }
     },
     onclick() {
+
       console.log("查询待定值");
       let startTime = null;
       let endTime = null;

src/views/statisticalReport/components/defendCapacity/getCapacityByDefend.vue

@@ -35,7 +35,7 @@
         clearable
       >
       </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="onclickSearch">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -134,7 +134,8 @@ export default {
     getRequestUrl() {
       this.option.requestUrl =
         "/api/v1/tms/getCapacityByDefend?apiId=474&startTime=null&endTime=null&i=" +
-        new Date();
+        new Date() +
+        "&con=" + this.input;
     },
     // 添加开始结束时间筛选
     onclickSearch() {
@@ -156,6 +157,7 @@ export default {
             startTime +
             "&endTime=" +
             endTime +
+            "&con=" + this.input +
             "&i=" +
             new Date();
         } else {