zhouzh %!s(int64=3) %!d(string=hai) anos
pai
achega
475874ad65

+ 2 - 2
build/utils.js

@@ -19,8 +19,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 
- let devModules = ['all'];
- //let devModules = ['index','RMS']
+ //let devModules = ['all'];
+ let devModules = ['index','RMS']
 //let devModules = ['index','SporadicManage','TMS']
 // let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];

+ 2 - 2
config/index.js

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

+ 62 - 4
src/views/RMS/components/addCapacity.vue

@@ -6,6 +6,17 @@
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="inputBox">
+    <span class="text">所属单位类型</span>
+      <el-autocomplete
+        v-model="state"
+        @input="onInput"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        :trigger-on-focus="false"
+        @select="handleSelect"
+      ></el-autocomplete>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -22,11 +33,45 @@ export default {
     return {
       form1: {},
       // value: undefined,
-     
+     carrierIds:"",
+      state: "",
+      restaurants: [],
     };
   },
   mounted() {},
   methods: {
+     onInput() {
+      this.axios.post(
+        "/api/v1/rms/getCarrierName?state="+this.state,
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+          res.data.data.forEach(element => {
+            this.restaurants.push({
+              value:element.carrierName,
+              carrierIds:element.carrierId
+            })
+          });
+        }
+        
+      });
+    },
+    querySearch(queryString, cb) {
+        var restaurants = this.restaurants;
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
+    handleSelect(item){
+      this.carrierIds=item.carrierIds;
+      console.log(item)
+    },
+   
      makeSure() {
        console.log(this.from1)
        let RmsCapacity={
@@ -36,7 +81,10 @@ export default {
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.form1.carrierId,
+        // carrierId:this.form1.carrierId,
+        state:this.state,
+        carrierName:this.state,
+        carrierIds: this.carrierIds,
        };
        if(
          RmsCapacity.capacityNumber==null ||
@@ -44,7 +92,7 @@ export default {
          RmsCapacity.capacityOwneris==null ||
          RmsCapacity.capacityVip==null ||
          RmsCapacity.capacityBlacklist==null ||
-         RmsCapacity.carrierId==null
+         RmsCapacity.carrierIds==null
        )this.$message.error("存在空值!");
        else
       this.axios
@@ -52,6 +100,7 @@ export default {
           "/api/v1/rms/insertCapacity", RmsCapacity
         )
         .then((res) => {
+          console.log("res.data.code",res.data.code);
           if (res.data.code == 200) {
             this.$message({
               type: "success",
@@ -62,7 +111,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+          // this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -81,6 +130,15 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.inputBox{
+     display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.1000rem;
+  margin-bottom: 0.25rem;
+  margin-left: -12rem;
+}
 .form-box{
   display: flex;
   justify-content: center;

+ 13 - 7
src/views/RMS/components/addCarDriver.vue

@@ -20,9 +20,10 @@
     <div class="photoBox">
    <el-upload
   class="upload-demo"
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
   :file-list="fileList"
   list-type="picture">
   <div>行驶证照片
@@ -34,9 +35,10 @@
      <div class="photoBox">
    <el-upload
   class="upload-demo"
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
   :file-list="fileList"
   list-type="picture">
   <div>驾驶证照片
@@ -48,9 +50,10 @@
       <div class="photoBox">
    <el-upload
   class="upload-demo"
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
   :file-list="fileList"
   list-type="picture">
   <div>运输证照片
@@ -63,9 +66,10 @@
  <div class="photoBox">
    <el-upload
   class="upload-demo"
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
   :file-list="fileList"
   list-type="picture">
   <div>从业资格证照片
@@ -96,7 +100,7 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-     
+      imageUrl:"",
     };
   },
   mounted() {},
@@ -132,7 +136,9 @@ export default {
       this.carrierIds=item.carrierIds;
       console.log(item)
     },
-   
+    handleAvatarSuccess(res,file){
+      this.imageUrl=URL.createObjectURL(file.raw);
+    },
     handleRemove(file, fileList) {
         console.log(file, fileList);
       },
@@ -185,7 +191,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          this.$refs['table'].resetField();
+          //this.$refs['table'].resetField();
         });
     },
     // 取消

+ 4 - 3
src/views/RMS/components/addConsignee.vue

@@ -26,7 +26,6 @@ export default {
   mounted() {},
   methods: {
      makeSure() {
-       console.log("enter11111111111111111111111")
        console.log(this.form1)
        let RmsConsignee={
          companyName:this.form1.companyName,
@@ -53,7 +52,9 @@ export default {
             "/api/v1/rms/insertConsignee",
             RmsConsignee
           )
+    
           .then((res) => {
+               console.log("res.data.code",res.data.code);
             if (res.data.code == 200) {
               this.$message({
                 type: "success",
@@ -62,9 +63,9 @@ export default {
               // this.$refs.table.refreshData();
               this.$router.go(-1);
             } else {
-              this.$message.error("新增失败");
+              this.$message.error("新增失败,可能有重复");
             }
-           this.$refs['table'].resetField();
+          // this.$refs['table'].resetField();
           });
     },
     // 取消