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

build/utils.js

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

config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.102:8019",
-    // target: "http://192.168.1.112:8019",
+    // target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.113:8019",
+    // target: "http://192.168.1.114:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue

@@ -228,7 +228,7 @@
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange" :drawer="aaadrawer">
         </dilTable>
       </div>
     </el-drawer>
@@ -270,6 +270,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      aaadrawer:false,
       disabled:false,
       materialTimes:null,
       options: [],
@@ -312,7 +313,7 @@ export default {
           width: "140",
         },
         {
-          prop: "Specification",
+          prop: "materialSpecification",
           label: "规格型号",
           width: "140",
         },
@@ -382,14 +383,22 @@ export default {
         });
       }
     },
+    table(val){
+      if(val){
+        this.aaadrawer = false;
+      }else{
+        this.aaadrawer = true;
+      }
+    }
   },
   methods: {
     onclickMaterial(){
         if(this.inputMaterial != null){
           this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"+ "&index=" + this.inputMaterial
+          this.inputMaterial = null
         }
         else{
-          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" + "&i=" + new Date() 
         }
     },
     onInputTimes(){
@@ -490,11 +499,16 @@ export default {
     },
     // 返回主界面
     makeSure1() {
+      if(this.tableData.length != 0){
+        this.$message.error("物资已选择，请删除后重试")
+        return
+      }
+      if(JSON.stringify(this.selectionList1).length != 2){
         this.selectionList1.materialPriority = 1
         this.tableData.push(this.selectionList1);    
         this.selectionList1 = [];
         this.table = false;
-        console.log(this.selectionList1)
+      }
     },
     //取消模态框多选
     open() {

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -56,6 +56,11 @@
           </el-table-column>      
           </dilTable>
         </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed">
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -79,6 +84,9 @@ export default {
       first: {
         requestUrl:"",
       },
+      completed:{
+        requestUrl:"",
+      },
       //车辆信息的表格
       truck: {
         requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
@@ -136,13 +144,16 @@ export default {
       }
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId")
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode")
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode")
       }    
   },
   
@@ -159,12 +170,16 @@ export default {
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date(),
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&test=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl =  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()     
       }
     },
     //删除运输订单

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue

@@ -0,0 +1,52 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/Load.vue

@@ -0,0 +1,52 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/enFactory.vue

@@ -0,0 +1,53 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+    console.log("enter!")
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue

@@ -0,0 +1,52 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue

@@ -0,0 +1,52 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/unload.vue

@@ -0,0 +1,52 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -289,6 +289,9 @@ export default {
         },{
           value:13,
           label:'出厂'
+        },{
+          value:20,
+          label:'内转(新区-老区)'
         }
       ],
       orderType:12,

src/views/SporadicManage/router/index.js

@@ -65,8 +65,13 @@ import mornThanOUToutFactory from '../components/moreThanMaterialTruck/sporadicO
 import mornThanOUTtareWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue'
 import mornThanOUTload from '../components/moreThanMaterialTruck/sporadicOutfactory/load.vue'
 
-
-
+// 内转零星内转进厂展示界面
+import sporadicEnfactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue'
+import sporadicgrossWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue'
+import sporadicLeavefactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue'
+import sporadicLoadInward from '../components/sporadicMaterial/inwardSporadicFactory/Load.vue'
+import sporadicTareWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue'
+import sporadicUnloadInward from '../components/sporadicMaterial/inwardSporadicFactory/unload.vue'
 
 Vue.use(Router)
 const constantRouterMap = [
@@ -134,6 +139,14 @@ const constantRouterMap = [
        {path:'mornThanOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUToutFactory},
        {path:'mornThanOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTtareWeight},
        {path:'mornThanOUTload',name:'mornThanOUTload',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTload},
+
+       //内转零星内转
+       {path:'sporadicEnfactoryInward',name:'sporadicEnfactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicEnfactoryInward},
+       {path:'sporadicgrossWeightInward',name:'sporadicgrossWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicgrossWeightInward},
+       {path:'sporadicLeavefactoryInward',name:'sporadicLeavefactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLeavefactoryInward},
+       {path:'sporadicLoadInward',name:'sporadicLoadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLoadInward},
+       {path:'sporadicTareWeightInward',name:'sporadicTareWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicTareWeightInward},
+       {path:'sporadicUnloadInward',name:'sporadicUnloadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicUnloadInward},
     ]    
   }
 ];

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -445,7 +445,8 @@ export default {
       } else if (num == 5) {
         this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81" + "&sendCompId=" +
+          this.supplierId + "&i=" + new Date();
       }
       
     },

src/views/WMS/components/steel/addCheckWarehouse.vue

@@ -0,0 +1,209 @@
+<template>
+  <!-- 新增盘库作业页面 -->
+  <div class="addCheckWarehouse">
+    <page-title>盘库作业</page-title>
+    <div class="material from">
+      <span class="text">仓库：</span>
+      <el-input class="input" v-model="warehouseName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="material from">
+      <span class="text">物资：</span>
+      <el-input class="input" v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">件数：</span>
+      <el-input class="input" v-model="materialNumber"> </el-input>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div style="margin-bottom: 10px">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick(a)">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="first"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="second"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>          
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      disabled:false,
+      //仓库名称
+      warehouseName:null,
+      //物资名称
+      materialName: null,
+      //物资编码
+      materialCode:null,
+      //盘点数量
+      materialNumber:null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      first: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second: {
+          requestUrl: "",
+          selectionType:"radio"
+      }
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (!val) {
+        this.input = null;
+      }
+    },
+  },
+  created() {
+      
+  },
+  methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.first.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if(num==1){
+          this.first.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244" + "&i=" + new Date()
+      }else{
+          this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/steel_checkWarehouse");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.materialName = selection.materialName + selection.materialSpecification + '(' + selection.materialModel + ')' ;
+      this.materialId = selection.materialId;
+      this.materialCode = selection.materialCode
+    },
+    currentRadioChange2(selection) {
+      this.warehouseId = selection.warehouseId
+      this.warehouseName = selection.warehouseName
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.warehouseId,this.materialCode,this.materialNumber);
+      this.disabled = true
+      this.axios.post("/api/v1/wms/insertStockTaking?warehouseId=" + this.warehouseId + "&materialCode=" + this.materialCode + "&quantity=" + this.materialNumber ).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.disabled = false
+            this.onClickCancel()
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+.addCheckWarehouse{
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.warehouse {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-right: 70px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.materialNumber {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 70px;
+    .text {
+        display:inline-block;
+        width: 170px;
+        text-align: right;
+    }
+    .input {
+        width: 250px;
+        margin-right: 20px;
+    }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+}
+</style>

src/views/WMS/components/steel/checkWarehouse.vue

@@ -0,0 +1,65 @@
+// 盘库作业
+<template>
+  <div class="steel_inbound">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" class="input" 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="btn1" @click="AddClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 框计算的输入框的值
+      inputText: null,
+      // 表格渲染的表头及数据
+      option: {
+        requestUrl: "/api/v1/wms/getStockTakingList?apiId=442",
+      },
+    };
+  },
+  methods: {
+    // 框计算查询按钮
+    onclick() {
+      console.log(this.inputText)
+    },
+    // 跳转新增运输路线页面
+    AddClick() {
+      this.$router.push({
+        path: "/steel_addCheckWarehouse",
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound{
+  .top{
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+    .input{
+      width: 250px;
+    }
+    .btn{
+      margin: 20px;
+    }
+  }
+}
+
+</style>

src/views/WMS/router/index.js

@@ -35,6 +35,8 @@ import steel_restack from '../components/steel/steel_restack.vue'
 import steel_restackAdd from '../components/steel/steel_restackAdd.vue'
 import steel_sendreceive from '../components/steel/steel_sendreceive.vue'
 import steel_transfer from '../components/steel/steel_transfer.vue'
+import steel_checkWarehouse from '../components/steel/checkWarehouse.vue'
+import steel_addCheckWarehouse from '../components/steel/addCheckWarehouse.vue'
 Vue.use(Router)
 const constantRouterMap = [
 	{
@@ -74,6 +76,8 @@ const constantRouterMap = [
 		{path: 'steel_restackAdd', name: 'steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: steel_restackAdd},
 		{path: 'steel_sendreceive', name: 'steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: steel_sendreceive},
 		{path: 'steel_transfer', name: 'steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: steel_transfer},
+		{path: 'steel_checkWarehouse', name: 'steel_checkWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: steel_checkWarehouse},
+		{path: 'steel_addCheckWarehouse', name: 'steel_addCheckWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: steel_addCheckWarehouse},
 	  ]
 	}
   ];

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

@@ -15,7 +15,7 @@
     <!-- 车序号表格 -->
     <div class="switch" v-if="selectionList.length > 0">
       <el-tooltip placement="top">
-        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <div slot="content">下面表格已有数据，不能进行更改!!!</div>
         <el-switch
           v-model="value"
           active-text="件数"
@@ -58,7 +58,7 @@
           <template slot="scope" v-if="item.label !== '车序号'">
             <span>{{ item.label }}</span>
           </template>
-          <template slot="scope" v-if="item.label !== '收货地址'">
+          <template slot="scope" v-if="item.label !== '运输单价'">
             <span>{{ item.label }}</span>
           </template>
           <template slot="scope" v-if="item.label !== '截止日期'">
@@ -90,11 +90,11 @@
                   @change="updateArragneCxh(scope.row.cxh)"
                 ></el-input>
               </template>
-              <!-- 收货地址id -->
-              <template v-if="item.prop == 'saleShipperAddressName'" >
+              <!-- 运输单价id -->
+              <template v-if="item.prop == 'priceValue'" >
                 <el-input
                   style="width: 200px"
-                  v-model="scope.row.saleShipperAddressName"
+                  v-model="scope.row.priceValue"
                   disabled
                 >
                 </el-input>
@@ -129,7 +129,7 @@
                   v-model.number="scope.row.saleOrderConsigneeTel"
                 ></el-input>
               </template>
-              <!-- 排车数（不可见) -->
+              <!-- 排车数 -->
             <template v-if="item.prop == 'arragneCount'">
                 <el-input
                   class="textinput6"
@@ -170,12 +170,12 @@
         </el-table-column>
       </el-table>
     </div>
-    <!-- 收货地址的模态框 -->
+    <!-- 运输单价的模态框 -->
     <el-drawer 
       :visible.sync="addressDrawer" 
       :destroy-on-close="false"
       direction="rtl"
-      size="40%"
+      size="70%"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -205,9 +205,9 @@
         <i class="el-icon-check"></i>确定
       </el-button>
       <div class="tablecls">
-        <!-- 查询所有的收货地址 -->
+        <!-- 查询所有的运输单价 -->
         <dilTable
-          v-bind.sync="Address"
+          v-bind.sync="Price"
           @radio-change="currentRadioChange2"
         ></dilTable>
       </div>
@@ -247,6 +247,11 @@ export default {
         requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
         selectionType: "radio",
       },
+      //运输单价的表格
+      Price: {
+        requestUrl: "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0",
+        selectionType: "radio",
+      },
       table: false,
       selectionList: [],
       selectionList1: [],
@@ -300,11 +305,17 @@ export default {
           slot: true,
         },
         {
-          prop: "saleShipperAddressName",
-          label: "收货地址",
+          prop: "priceValue",
+          label: "运输单价",
           width: "300",
           slot: true,
         },
+        // {
+        //   prop: "saleShipperAddressName",
+        //   label: "收货地址",
+        //   width: "300",
+        //   slot: true,
+        // },
         {
           prop: "saleOrderConsignee",
           label: "收货客户",
@@ -325,6 +336,8 @@ export default {
         },
       ],
       row: {},
+      //缓存当前选中的运输单价
+      priceMap:{},
     };
   },
   // mounted() {
@@ -379,6 +392,8 @@ export default {
             saleMaterialId:row.saleMaterialId,
             saleOrderConsignee:row.saleOrderConsignee,
             saleOrderConsigneeTel:row.saleOrderConsigneeTel,
+            priceValue:row.priceValue,
+            priceId:row.priceId,
             saleShipperAddressId:row.saleShipperAddressId,
             saleShipperAddressName:row.saleShipperAddressName,
           })
@@ -430,8 +445,9 @@ export default {
     },
     //收货地址模态窗口的点击事件
     addAddressClick(){
-      this.selectionList[this.addressIndex].saleShipperAddressName = this.addressMap.address
-      this.selectionList[this.addressIndex].saleShippingAddressId = this.addressMap.addressId
+      //priceMap
+      this.selectionList[this.addressIndex].priceValue = this.priceMap.priceValue
+      this.selectionList[this.addressIndex].priceId = this.priceMap.priceId
       this.addressDrawer = false;
       let arr = this.selectionList;
       this.selectionList = [];
@@ -447,6 +463,8 @@ export default {
             saleMaterialId:e.saleMaterialId,
             saleOrderConsignee:e.saleOrderConsignee,
             saleOrderConsigneeTel:e.saleOrderConsigneeTel,
+            priceValue:e.priceValue,
+            priceId:e.priceId,
             saleShipperAddressId:e.saleShipperAddressId,
             saleShipperAddressName:e.saleShipperAddressName,
         })
@@ -459,8 +477,8 @@ export default {
     },
     //收货地址模态框单选选中的事件
     currentRadioChange2(val){
-      this.addressMap = {};
-      this.addressMap = val;
+      this.priceMap = {};
+      this.priceMap = val;
     },
     // 框计算
     onclick() {
@@ -499,6 +517,8 @@ export default {
           saleOrderConsignee: null,
           saleOrderConsigneeTel: null,
           saleMaterialId: e.saleMaterialId,
+          priceValue:e.priceValue,
+          priceId:e.priceId,
           // materialTheoreticalWeight: e.materialTheoreticalWeight,
           arragneCount : this.arragneCount,
         };
@@ -537,6 +557,8 @@ export default {
                 saleMaterialId : 0,
                 //物资数量
                 materialNumber : 0,
+                //运输单价ID
+                priceId: 0,
             };
         mapItem.saleOrderId=this.$route.params.saleOrderId;
         mapItem.truckNo=item.cxh;
@@ -546,8 +568,10 @@ export default {
         mapItem.orderConsigneeTel=item.saleOrderConsigneeTel;
         mapItem.saleMaterialId=item.saleMaterialId;
         mapItem.materialNumber=item.orderPlanWeight;
+        mapItem.priceId=item.priceId;
         mapList.push(mapItem);
       });
+      console.log("mapList",mapList)
         this.axios.post("/api/v1/ams/addTruckNo", mapList).then((res) => {
           if (res.data.code == "200") {
             this.$router.go(-1);

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

@@ -48,7 +48,7 @@
           <template slot="scope" v-if="item.label !== '重量'">
             <span>{{ item.label }}</span>
           </template>
-          <template slot="scope" v-if="item.label !== '收货地址'">
+          <template slot="scope" v-if="item.label !== '运输单价'">
             <span>{{ item.label }}</span>
           </template>
           <template slot="scope" v-if="item.label !== '截止日期'">

src/views/inward/components/truckAppoint/addPlan.vue

@@ -85,7 +85,7 @@ export default {
       },
       createFilter(queryString) {
         return (restaurants) => {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
         };
       },
     currentRadioChange(selection){

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -1,13 +1,9 @@
 // 新增厂内内转需求
 <template>
-  <div id="endMaintenance">
+  <div class="inwardRequirement">
     <page-title>新增需求</page-title>
-    <div class="main">
-      
-      <span class="a"></span>
-    </div>
     <div>
-      <div class="form-box f2">
+      <div class="material form">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="物资">
             <el-input v-model="materialName" disabled> </el-input>
@@ -17,19 +13,46 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box f5">
+      <div class="materialWeight form">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="用车地点">
-            <el-input v-model="truckPoint" disabled> </el-input>
+          <el-form-item label="物资重量">
+            <el-input v-model="materialWeight"> </el-input>
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+        </el-form>
+      </div>
+      <div class="materialNum form">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="物资数量">
+            <el-input v-model="materialNum"></el-input>
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box f5">
+      <!-- 用车单位 -->
+      <div class="requireUnit form">
+       <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="用车单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="requireUnitName"
+          :fetch-suggestions="querySearchCarrier"
+          placeholder="请输入用车单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectCarrier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.shipperName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+    </el-form>
+    </div>
+      <div class="unloadPoint form">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="卸货地点">
+          <el-form-item label="卸车点">
             <el-input v-model="truckPoint1" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -37,9 +60,9 @@
           </el-form-item>
         </el-form>
       </div>
-       <div class="form-box f5">
+      <div class="loadPoint form">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="装货月台">
+          <el-form-item label="装车点">
             <el-input v-model="requirementPlatformName" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -47,7 +70,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box" >
+      <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
       <el-drawer
@@ -59,7 +82,7 @@
         <el-input
           placeholder="请输入内容"
           v-model="input"
-          style="margin-top: 10px; margin-left: 20px"
+          style="margin-top: 10px; margin-left: 10px; width: 250px"
           clearable
         >
         </el-input>
@@ -73,11 +96,23 @@
         </el-button>
         <div v-show="a == 1">
           <dilTable
-            v-bind.sync="second"
+            v-bind.sync="materialTable"
             @radio-change="currentRadioChange1"
           ></dilTable>
         </div>
-        <div v-show="a !== 1">
+        <div v-show="a == 2">
+          <dilTable
+            v-bind.sync="second1"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+        <div v-show="a == 3">
+          <dilTable
+            v-bind.sync="second1"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+        <div v-show="a == 4">
           <dilTable
             v-bind.sync="second1"
             @radio-change="currentRadioChange2"
@@ -85,7 +120,7 @@
         </div>
       </el-drawer>
     </div>
-    <div class="button-box" >
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -95,39 +130,68 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
-      purchaseOrder: "",
-      foreignShipName: "",
-      materialName: "",
-      requirementPlatformName: "",
+      materialName: null,
+      requirementPlatformName: null,
+      materialNum:null,
+      materialWeight:null,
       a: 1,
       direction: "rtl",
-      input: "",
+      input:null,
       requiremntUnitId: null,
       requirementUnloadUnitId: null,
-      requirementPlatformId:  null,
+      requirementPlatformId: null,
       truckPoint: "",
       materialId: null,
-      truckPoint1:'',
+      requireUnitName:null,
+      shipperId:null,
+      truckPoint1: "",
       drawer: false,
       form: {},
-      second: {
-        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244",
+      materialTable: {
+        requestUrl: "",
         selectionType: "radio",
-        mapList1: [],
+        mapList1: []
       },
       second1: {
         requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
         selectionType: "radio",
-        mapList2: [],
-      },
+        mapList2: []
+      }
     };
   },
   methods: {
+     //用车单位弹出层
+    handleSelectCarrier(item){    
+      this.shipperId = item.shipperId
+      this.requireUnitName = item.shipperName 
+    },
+    //以下是用车单位边输边查搜索
+    querySearchCarrier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getRequireUnitName?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.shipperName.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是用车单位边输边查搜索
     ondrawer(num) {
+      if(num==1){
+        this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }
       this.drawer = true;
       this.a = num;
     },
@@ -135,31 +199,40 @@ export default {
       done();
     },
     onclick(a) {
-      if (a == 1) {
-        this.second.requestUrl =
+      if(this.input != null){
+        if (a == 1) {
+        this.materialTable.requestUrl =
           "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
-      } else {
-        console.log(a)
+          this.input = null
+        } else {
         this.second1.requestUrl =
           "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+          this.input = null
+      }
+      }else{
+        this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
       }
     },
     currentRadioChange1(selection) {
-      this.mapList1 = selection
-      this.purchaseOrder = this.mapList1.purchaseOrderNo
-      this.foreignShipName = this.mapList1.resultForeignShipName
-      this.materialName = this.mapList1.materialName;
+      this.mapList1 = selection;
+      console.log(selection)
+      if(selection.materialSpecification==null||selection.materialModel==null){
+        this.materialName = this.mapList1.materialName
+      }else{
+        this.materialName = this.mapList1.materialName + selection.materialSpecification + '(' + selection.materialModel + ')';
+      }
+      
       this.materialId = selection.materialId;
     },
     currentRadioChange2(selection) {
-      this.mapList2 = selection
-      if(this.a == 2){
+      this.mapList2 = selection;
+      if (this.a == 2) {
         this.truckPoint = selection.wareHouseName;
         this.requiremntUnitId = selection.wareHouseId;
-      }else if(this.a == 3){
+      } else if (this.a == 3) {
         this.requirementUnloadUnitId = selection.wareHouseId;
         this.truckPoint1 = selection.wareHouseName;
-      }else if(this.a == 4){
+      } else if (this.a == 4) {
         this.requirementPlatformId = selection.wareHouseId;
         this.requirementPlatformName = selection.wareHouseName;
       }
@@ -168,29 +241,29 @@ export default {
     makeSure() {
       let requiremnet = {
         materialId: this.materialId,
-        requiremntUnitId: this.requiremntUnitId,
-        capacityTypeId: this.form.capacityTypeId,
-        materialWeight: this.form.materialWeight,
-        materialNumber: this.form.materialNumber,
+        materialWeight: Number(this.materialWeight),
+        materialNumber: Number(this.materialNum),
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: this.form.requirementOverlimit,
-        requirementShipperId: this.form.requirementShipperId,
         requirementTruckTime: sjTime(this.form.requirementTruckTime),
         requirementType: this.form.requirementType,
         requirementWorkContent: this.form.requirementWorkContent,
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
-        requirementUnloadUnitId:this.requirementUnloadUnitId,
-        requirementPlatformId: this.requirementPlatformId
+        requirementUnloadUnitId: this.requirementUnloadUnitId,
+        requirementPlatformId: this.requirementPlatformId,
+        requirementShipperId: this.shipperId,
+        orgCode:getCookie("orgCode")
       };
       console.log(requiremnet);
+      debugger
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
-              message: "新增成功!",
+              message: "新增成功!"
             });
             this.$router.go(-1);
           } else {
@@ -201,23 +274,104 @@ export default {
     // 返回
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss">
-.el-form-item{
-  display: flex;
-}
-.form-box,
-.button-box
-{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+.inwardRequirement {
+  .from {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
+    }
+  .material {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .text {
+      display: inline-block;
+      width: 170px;
+      text-align: right;
+      }
+    .input {
+      width: 250px;
+      margin-right: 20px;
+      }
+    }
+    .materialWeight,
+    .materialNum {
+      display: flex;
+      justify-content: center;
+      margin-top: 20px;
+      margin-right: 100px;
+      .text {
+        display: inline-block;
+        width: 170px;
+        text-align: right;
+        .input {
+          width: 250px;
+          margin-right: 20px;
+        }
+      }
+    }
+    .requireUnit {
+      display: flex;
+      justify-content: center;
+      margin-top: 20px;
+      margin-right: 127px;
+      .text {
+        display: inline-block;
+        width: 170px;
+        text-align: right;
+        .input {
+          width: 250px;
+          margin-right: 90px;
+        }
+      }
+    }
+    .loadPoint,
+    .unloadPoint {
+      display: flex;
+      justify-content: center;
+      margin-top: 20px;
+      margin-right: 10px;
+      .text {
+        display: inline-block;
+        width: 170px;
+        text-align: right;
+        .input {
+          width: 250px;
+          margin-right: 90px;
+        }
+      }
+    }
+  .form-box {
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    margin-right: 212px;
+    .el-form-item {
+      display: flex;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20px;
+    margin-right: 90px;
+  }
 }
-
 </style>

src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -43,7 +43,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second">
+            <dilTable v-bind.sync="second" @func="func">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -51,7 +51,7 @@
                     size="mini"
                     @click="stopRequirement(scope)"
                   >
-                    停用
+                    {{startStop}}
                   </el-button>
                 </template>
               </el-table-column>
@@ -67,6 +67,8 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      startStop:null,
+      startStopValue:null,
       inputText: "",
       first: {
         // first请求数据的地址
@@ -93,6 +95,16 @@ export default {
     }
   },
   methods: {
+    func(res){
+        console.log(res.list)
+        res.list.forEach(e => {
+            if(e.enable = "未启用"){
+               this.startStop = "启用"
+            }else{
+               this.enable = "停用"
+            }
+        });
+    },
     getRequestUrl(){
       if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"){
         this.first.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=0" + "&t=" + new Date()

src/views/inward/components/truckAppoint/requirement.vue

@@ -7,20 +7,13 @@
       <el-button type="primary" class="btn">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="toInsert"
-        v-if="activeName == 'first'"
-      >
-        <i class="el-icon-plus"></i>新增</el-button>
       <el-button
         type="primary"
         class="btn"
         @click="toInsert2"
         v-if="activeName == 'first'"
       >
-        <i class="el-icon-plus"></i>新增厂内内转需求
+        <i class="el-icon-plus"></i>新增
       </el-button>
       <el-button
         type="primary"
@@ -65,6 +58,7 @@
   </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -72,19 +66,37 @@ export default {
       first: {
         // first请求数据的地址
         requestUrl:
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0",
+          "",
         selectionType: "select",
         mapList: [],
       },
       second: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1",
+          "",
       },
       activeName: "first",
     };
   },
+  created(){
+    if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0"
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1"
+    }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode")
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode")
+    }
+  },
   methods: {
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" + new Date()
+      }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      }
+    },
     selectionChange(selection) {
       this.first.mapList = selection;
     },
@@ -117,7 +129,7 @@ export default {
                   type: "success",
                   message: "删除成功!",
                 });
-                this.$router.go(0);
+                this.getRequestUrl()
               } else {
                 this.$message({
                   message: "删除失败",
@@ -150,8 +162,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-              this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&test=1"
-              this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
+              this.getRequestUrl()
               this.activeName = 'second'
               } else {
                 this.$message({

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

@@ -149,7 +149,7 @@ export default {
   },
   created(){
     this.userCarrierId = getCookie("userId")
-    this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
+    this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246"
   },
   mounted(){
       this.information()

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

@@ -55,8 +55,8 @@ export default {
   },
   created(){
       this.userCarrierId = getCookie('userId'),
-      this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=" + this.userCarrierId
-      this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + this.userCarrierId
+      this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3"
+      this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4"
   },
   methods: {
     selectionChange(selection) { 
@@ -82,10 +82,6 @@ export default {
                   type: "success",
                   message: "分派成功!",
                 });
-                this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=" + this.userCarrierId + "&test=1"
-                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + this.userCarrierId + "&test=1"
-                this.activeName = 'second'
-                this.first.mapList = []
               } else {
                 this.$message({
                   message: "分派失败",
@@ -119,7 +115,6 @@ export default {
                   type: "success",
                   message: "删除成功!",
                 });
-                this.$router.go(0);
               } else {
                 this.$message({
                   message: "删除失败",

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

@@ -59,7 +59,7 @@ export default {
   data() {
     return {
       inputText: "",
-      carrierId:null,
+      carrierId:40,
       first: {
         // first请求数据的地址
         requestUrl:
@@ -80,12 +80,17 @@ export default {
   },
   created(){
       this.carrierId = getCookie('userId')
-      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId
-      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId
-      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId
+      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
+      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
+      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
       console.log(this.carrierId)
   },
   methods: {
+    getRequestUrl(){
+      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&i="  + new Date()
+      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&i=" + new Date()
+    },
     receiver(scope) {
       this.$confirm("是否接收", "提示", {
         confirmButtonText: "确定",
@@ -102,9 +107,7 @@ export default {
                   type: "success",
                   message: "接收成功!",
                 });
-                this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId + "&test=1"
-                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId + "&test=1"
-                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId + "&test=1"
+                this.getRequestUrl()
               } else {
                 this.$message({
                   message: "接收失败",
@@ -144,9 +147,7 @@ export default {
                   type: "success",
                   message: "删除成功!",
                 });
-                 this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId + "&test=1"
-                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId + "&test=1"
-                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId + "&test=1"
+                this.getRequestUrl()
               } else {
                 this.$message({
                   message: "删除失败",
@@ -182,7 +183,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-                this.first.requestUrl = ""
+                this.getRequestUrl()
               } else {
                 this.$message({
                   message: "下发失败",

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

@@ -55,12 +55,14 @@ export default {
         console.log(res)
         var resultNetWeightTotalFirst = 0
         var resultNetWeightTotalSecond = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotalFirst = resultNetWeightTotalFirst+e.netWeightFirst
           resultNetWeightTotalSecond = resultNetWeightTotalSecond + e.netWeightSecond
         });
         this.totalNumberFrist = resultNetWeightTotalFirst.toFixed(2) + "t" + "/" + resultNetWeightTotalSecond.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441&startTime=null&endTime=null&i=' +new Date();

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -64,11 +64,13 @@ export default {
      func(res){
         console.log(res)
         var resultNetWeightTotal = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
         });
         this.totalNumber = resultNetWeightTotal.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         if (

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -59,11 +59,13 @@ export default {
     func(res){
         console.log(res)
         var resultNetWeightTotal = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
         });
         this.totalNumber = resultNetWeightTotal.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){