tj

build/utils.js

@@ -15,9 +15,9 @@ 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 = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','statisticalReport','appoint','RMS','TMS'];
-// let devModules = ['index','SporadicManage','inward'];
+let devModules = ['index','SporadicManage','inward','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

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

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

@@ -545,7 +545,7 @@ export default {
     // 确认
     makeSure() {
         this.disabled = true
-        if(this.supplierId==null||this.lineId==null||this.consigneeId==null){
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null||this.materialTimes==null){
           this.disabled = false
           this.$message.warning("存在值未填写")
           return

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

@@ -258,9 +258,9 @@ export default {
 <style lang='scss'>
 .addSaleOrderSend {
   .el-drawer__body {
-   overflow: auto;
+    overflow: auto;
 }
-.el-drawer__container ::-webkit-scrollbar{
+  .el-drawer__container ::-webkit-scrollbar{
     display: none;
 }
   .from {

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

@@ -575,7 +575,7 @@ export default {
     // 确认
     makeSure() {
         this.disabled = true
-        if(this.supplierId==null||this.lineId==null||this.consigneeId==null){
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false
           this.$message.warning("存在值未填写")
           return

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

@@ -89,13 +89,14 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+<style lang="scss" >
+.steel_inbound {
+  .sache {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
 }
 </style>

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

@@ -14,14 +14,14 @@
         v-if="activeName == 'first'"
       >
         <i class="el-icon-plus"></i>新增</el-button>
-      <!-- <el-button
+      <el-button
         type="primary"
         class="btn"
         @click="toInsert2"
         v-if="activeName == 'first'"
       >
         <i class="el-icon-plus"></i>新增厂内内转需求
-      </el-button> -->
+      </el-button>
       <el-button
         type="primary"
         class="btn"