tijiao

build/utils.js

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

config/index.js

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

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

@@ -555,7 +555,7 @@ export default {
     ondrawer(num) {
       if(getCookie("orgCode") == "biemeierchejian"){
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂：零星单拼出厂" 
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂-总厂：采购内转燃料路线" 
       }else{
         this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();

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

@@ -105,7 +105,7 @@ export default {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244" + "&i=" + new Date()
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443"
       }else{
           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
       }

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

@@ -39,12 +39,22 @@ data(){
   methods:{
     demotionClick(gridId){
       this.$router.push("/steel_realDown/" + gridId);
+    },
+    onClick(){
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      console.log(this.inputText)
     }
   },
 };
 </script>
 <style lang="scss" scode>
-.steel_real {
-    padding: 1.25rem 1.875rem;
+.steel_real{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
 }
 </style>

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

@@ -2,8 +2,8 @@
 <template>
   <div class="addInwardPlan">
     <page-title>新增计划</page-title>
-<div class="form-box">
-<el-form  class="demo-form-inline"  label-width="80px" label-position="left">
+  <div class="carrier form">
+  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
   <el-form-item label="承运商">
     <el-autocomplete
       class="inline-input"
@@ -19,11 +19,13 @@
   </template>
     </el-autocomplete>
   </el-form-item>
-  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
-  <el-form-item label="车数">
+  <div class="truckNum">
+    <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
+    <el-form-item label="车数">
     <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
-  </el-form-item>
+    </el-form-item>
   </el-form>
+  </div>
 </el-form>
 </div>
     <template>
@@ -139,11 +141,11 @@ export default {
 
 <style lang="scss" scoped>
 .addInwardPlan{
-.form-box{
+.carrier{
   display: inline-block !important;
   margin-left: 38%;
   .el-input{
-    width:288px
+    width:250px
   }
   .input{
     margin-left: -10px;
@@ -152,8 +154,15 @@ export default {
     padding: 10px;  
   }
 }
+.truckNum {
+  .el-input{
+    width: 250px;
+  }
+}
 .button-box
 {
+  display: flex;
+  justify-content: center;
   margin-left: 25px !important;
 }
 }

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

@@ -286,21 +286,18 @@ export default {
   }
 }
 .box-form{
-  display: inline-block !important;
-  padding-left: 38%;
-  .el-form-item{
-  display: flex;
-  padding: 10px;
-  .el-form-item__label{
-    width: 80px !important;
-  }
-  .el-input{
-    width:288px
-  }
+  // display: flex;
+  // justify-content: center;
+  padding-left: 40.5%;
+  margin-right: 100px;
+  .el-form-item__content {
+    display: flex;
   }
 }
 .button-box{
- margin-left: 25px !important;
+  display: flex;
+  justify-content: center;
+  margin-left: 25px !important;
 }
 }