合并

build/utils.js

@@ -15,8 +15,8 @@ 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 = ['all'];
+// let devModules = ['index','RMS','systemConfig']
+let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
 
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/RMS/components/addCarDriver.vue

@@ -17,67 +17,7 @@
         @select="handleSelect"
       ></el-autocomplete>
       </div>
-    <div class="photoBox">
-   <el-upload
-    class="upload-demo"
-    action="http://localhost:8080/api/v1/rms/upload"
-    :on-preview="handlePreview"
-    :on-remove="handleRemove"
-    :on-success="handleAvatarSuccess1"
-    :file-list="fileList"
-    list-type="picture">
-  <div>行驶证照片
-  <el-button size="small" type="primary">点击上传</el-button>
-  </div>
-</el-upload> 
-    </div>
-
-     <div class="photoBox">
-   <el-upload
-  class="upload-demo"
-  action="http://localhost:8080/api/v1/rms/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess2"
-  :file-list="fileList"
-  list-type="picture">
-  <div>驾驶证照片
-  <el-button size="small" type="primary">点击上传</el-button>
-  </div>
-</el-upload> 
-    </div>
-
-      <div class="photoBox">
-   <el-upload
-  class="upload-demo"
-  action="http://localhost:8080/api/v1/rms/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess3"
-  :file-list="fileList"
-  list-type="picture">
-  <div>运输证照片
-  <el-button size="small" type="primary">点击上传</el-button>
-  </div>
-</el-upload> 
-    </div>
-
-
- <div class="photoBox">
-   <el-upload
-  class="upload-demo"
-  action="http://localhost:8080/api/v1/rms/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess4"
-  :file-list="fileList"
-  list-type="picture">
-  <div>从业资格证照片
-  <el-button size="small" type="primary">点击上传</el-button>
-  </div>
-</el-upload> 
-    </div>
-
+    
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -100,11 +40,6 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      imageUrl1:"",
-      imageUrl2:"",
-      imageUrl3:"",
-      imageUrl4:"",
-      imageUrls:[],
     };
   },
   mounted() {
@@ -141,53 +76,6 @@ export default {
     handleSelect(item){
       this.carrierIds=item.carrierIds;
       console.log(item)
-    },
-      beforeUpload2 (file) {
-        const isLt2M = file.size < 1024 * 1024 * 0.5
-        console.log('大小' + isLt2M)
-        if (!isLt2M) {
-          this.$message.error('上传文件大小不能超过500kb!')
-        }
-        let size = file.size / 1024
-        console.log('大小' + size)
-        let _URL = window.URL || window.webkitURL
-        let img = new Image()
-        img.onload = function () {
-          let width = img.width
-          let height = img.height
-          console.log('width--->' + width)
-          console.log('height--->' + height)
-        }
-        img.src = _URL.createObjectURL(file)
-        return isLt2M
-    },
-    handleAvatarSuccess1(res,file){
-      this.imageUrl1=URL.createObjectURL(file.raw);
-    },
-    handleAvatarSuccess2(res,file){
-      this.imageUrl2=URL.createObjectURL(file.raw);
-    },
-    handleAvatarSuccess3(res,file){
-      this.imageUrl3=URL.createObjectURL(file.raw);
-    },
-    handleAvatarSuccess4(res,file){
-       this.imageUrl4=URL.createObjectURL(file.raw);
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
-      );
-    },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
     },
     makeSure() {
       console.log(this.form1);
@@ -199,11 +87,6 @@ export default {
         driverIdentityCard: this.form1.driverIdentityCard,
         driverPhone: this.form1.driverPhone,
         transportTypeId: this.form1.transportTypeId,
-   //     carrierId: this.form1.carrierId,
-        driverPermitNo: this.form1.driverPermitNo,
-        driverLicence: this.form1.driverLicence,
-        driverLicence: this.form1.driverLicence,
-        driverLicence: this.form1.driverLicence,
         state:this.state,
         carrierName:this.state,
         carrierIds: this.carrierIds,
@@ -279,7 +162,6 @@ export default {
   justify-content: center;
   margin-top: 0.1000rem;
   margin-bottom: 0.25rem;
- // margin-left: -18rem;
 }
   .inputBox{
     display: flex;

src/views/RMS/components/addMaterial.vue

@@ -134,8 +134,9 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 1.5rem;
+  margin-top: 2rem;
   margin-bottom: 1.25rem;
+  margin-right: 10px;
 }
 .btn-left {
   margin-left: 470px;

src/views/RMS/components/carDriver.vue

@@ -47,13 +47,13 @@ export default {
       restaurants: [],
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getCarDriverList?apiId=339",
+        requestUrl: "/api/v1/rms/getCarDriverList?apiId=420",
       },
     }
   },
   methods:{
     onclick(){
-        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=339&con=" +this.textInput;
+        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=420&con=" +this.textInput;
       },
 
      toInsert() {

src/views/RMS/components/editCapacity.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
 </div>
-        <div class="form-box f1">
+        <!-- <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
 <div class="disableBox">
   <el-form-item>
@@ -40,7 +40,7 @@
             <i class="el-icon-search"></i>查询
           </el-button>
             <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
-</el-drawer>
+</el-drawer> -->
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -125,14 +125,14 @@ console.log(this.$route.params)
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.mapList.carrierId,
+       //  carrierId:this.mapList.carrierId,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||
          RmsCapacity.capacityOwneris==null ||
          RmsCapacity.capacityVip==null ||
-         RmsCapacity.capacityBlacklist==null ||
-         RmsCapacity.carrierId==null
+         RmsCapacity.capacityBlacklist==null 
+         //RmsCapacity.carrierId==null
        )this.$message.error("存在空值！");  
         console.log( this.$route.params.capacityId);
         this.axios

src/views/RMS/components/editRawWarehouse.vue

@@ -4,14 +4,32 @@
     <page-title>编辑</page-title>
     <div class="main">
     </div>
-    <div class="contractTitle">
+<!--     <div class="contractTitle">
       <div class="form-box">
         <div class="form-one">
           <dil-form :formId="355" v-model="form1"></dil-form>
         </div>
       </div>
-    </div>
+    </div> -->
 
+    <div class="shipperName">
+    <label>托运人</label>
+    <el-select v-model="shipperName" placeholder="请选择" @change="getValue">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
+     </div>
+  <div class="point">
+    <label>装卸点</label>
+  <el-input style="width: 220px;" v-model="warehouseName" placeholder="请输入内容"></el-input>
+  </div>
+  
+    
+         
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
@@ -26,11 +44,17 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {
-        warehouseName: '',
-      },
+    warehouseName : '',
+    shipperName: '',
+    options: [{
+          value: '',
+          label: ''
+        }],
     };
   },
+  created(){
+    this.getValue();
+  },
   mounted() {
       console.log(this.$route)
     this.information();
@@ -45,25 +69,36 @@ export default {
             this.$route.params.warehouseId
         )
         .then((res) => {
-            this.form1.warehouseName = res.data.data.warehouseName;
+            console.log("res",res)
+            this.shipperName=res.data.data.shipperId;
+            this.warehouseName=res.data.data.warehouseName;
+            
         });
     },
+    //单选下拉框
+    getValue(){
+       this.axios
+        .get(
+          "/api/v1/rms/getShipperId" 
+           
+        )
+        .then((res) => {
+            this.options = res.data.data;
+        });
+    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
     // 确认
     onClickConfirm() {
-      console.log(this.form1)
+     console.log("RmsWarehouse",RmsWarehouse)
        let RmsWarehouse={
       warehouseId:this.$route.params.warehouseId,
-      warehouseName:this.form1.warehouseName,
-      shipperId:this.form1.shipperId,
+      warehouseName:this.warehouseName,
+      shipperId:this.shipperName,
     };
-    if(
-         warehouseName==null
-       )this.$message.error("存在空值！");
-   console.log(RmsWarehouse)
+   console.log("RmsWarehouse",RmsWarehouse)
         this.axios
           .post(
             "/api/v1/rms/updateWarehouse",
@@ -83,9 +118,19 @@ export default {
  .button-box{
     display: flex;
     justify-content: center;
+    margin-top: 2rem;
     .el-button{
       width: 80px;
       margin-right: 10px;
     }
   }
+  .shipperName{
+    display: flex;
+    justify-content: center;
+  }
+  .point{
+    display: flex;
+    justify-content: center;
+    margin-top: 1rem;
+  }
 </style>