Your Name 3 gadi atpakaļ
vecāks
revīzija
7b67c99ce3

+ 8 - 1
build/utils.js

@@ -15,10 +15,17 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
+
+// let devModules = ['index','RMS','systemConfig']
+ //let devModules = ['index','RMS','statisticalReport','SporadicManage','TMS','WMS'];
+ let devModules = ['all'];
+// let devModules = ['index','RMS']
+
+
 // let devModules = ['index','RMS','systemConfig','TMS']
 // let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
-let devModules = ['index','SporadicManage','RMS']
+// let devModules = ['index','SporadicManage','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

+ 1 - 1
config/index.js

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

+ 1 - 1
src/views/RMS/components/addCapacity.vue

@@ -44,7 +44,7 @@ export default {
     return {
       form1: {},
       form1Initialization : {
-        capacityTypeId : '汽车',
+        capacityTypeId : 1,
         capacityNumber : '',
         capacityCorlor : '黄',
         capacityOwneris : '否',

+ 1 - 1
src/views/RMS/components/addCarDriver.vue

@@ -121,7 +121,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addGatepost.vue

@@ -66,7 +66,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 8 - 10
src/views/RMS/components/addMaterial.vue

@@ -50,6 +50,7 @@ export default {
       drawer: false,
       direction: 'rtl',
       inputText:"",
+      materialTypeId:"",
       options:{
         requestUrl:"/api/v1/rms/getMaterialTypeList?apiId=376",
         selectionType:"radio",
@@ -61,28 +62,25 @@ export default {
   methods: {
       currentRadioChange(selection){
       this.mapList=selection,
+      this.materialTypeId = this.mapList.materialTypeId;
       console.log(this.mapList)
       this.materialTypeName=this.mapList.materialTypeName
     },
     onclick(){
       this.options.requestUrl="/api/v1/rms/getMaterialTypeList?apiId=376&con=" +this.inputText;
     },
-     makeSure() {
+     makeSure() {  
+       
       let RmsMaterial = {
         materialName:this.form1.materialName,
         materialSpecification:this.form1.materialSpecification,
         materialModel:this.form1.materialModel,
-        materialTypeId:this.mapList.materialTypeId,
+        materialTypeId:this.materialTypeId,
         unitOfMeasureId:this.form1.unitOfMeasureId,
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
       };
-      if(
-        RmsMaterial.materialName==null ||
-        RmsMaterial.materialSpecification==null ||
-        RmsMaterial.materialModel==null ||
-        RmsMaterial.materialTypeId==null ||
-        RmsMaterial.unitOfMeasureId==null ||
-        RmsMaterial.materialTheoreticalWeight==null 
+    if(
+        RmsMaterial.materialName==null
       )this.$message.error("存在空值!");
       else
       this.axios
@@ -101,7 +99,7 @@ export default {
           } else {
             this.$message.error("新增失败");
           }
-          this.$refs['table'].resetField();
+          //this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addNotice.vue

@@ -56,7 +56,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addOilPrice.vue

@@ -54,7 +54,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addPier.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addPort.vue

@@ -54,7 +54,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addPortStorageYard.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addRawWarehouse.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addRmsShipper.vue

@@ -64,7 +64,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addSupplier.vue

@@ -107,7 +107,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

+ 1 - 1
src/views/RMS/components/addTruckCalculate.vue

@@ -99,7 +99,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs["table"].resetField();
+         // this.$refs["table"].resetField();
         });
     },
 

+ 2 - 1
src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -471,7 +471,8 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1) 
+      console.log(this.selectionList1)
+      //debugger  
       this.selectionList1.forEach((e) => {
         var addmap = {
           materialCode: e.materialCode,

+ 1 - 1
src/views/SporadicManage/components/steelReturn/transportAppoint/addSteelReturnTransportAppoint.vue

@@ -455,7 +455,7 @@ export default {
           mapList: this.tableData,
         };
         console.log(amsOrder);
-        debugger
+        //debugger
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.$router.push("/steelReturn/steelTransportAppoint");

+ 1 - 1
src/views/TMS/components/importedTruck/submitWaybill.vue

@@ -52,7 +52,7 @@ export default {
     };
   },
   mounted() {
-      debugger
+     // debugger
     this.restaurants = this.loadAll();
   },
   methods: {