Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/addCapacity.vue

@@ -7,7 +7,7 @@
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
       <div class="inputBox">
-    <span class="text">所属单位类型</span>
+    <span class="text">所属承运商</span>
       <el-autocomplete
         class="input"
         v-model="state"

src/views/RMS/components/addCarDriver.vue

@@ -79,7 +79,6 @@
     </div>
 
     <div class="button_box">
->>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>

src/views/RMS/components/addMaterial.vue

@@ -4,7 +4,6 @@
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
-
       </div>
         <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">

src/views/RMS/components/editCapacity.vue

@@ -10,12 +10,42 @@
           <dil-form :formId="310" v-model="form1"></dil-form>
       </div>
     </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
+</div>
+        <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+<div class="disableBox">
+  <el-form-item>
+     <el-input
+        placeholder=""
+        v-model="carrierName"
+        :disabled="true">
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
+  </el-form-item>
+  </div>
+   </el-form>
+    </div>
+  <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+</el-drawer>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
-</div>
+
 </template>
 
 <script>
@@ -25,7 +55,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
       form1: {},
+      carrierName:"",
+    options:{
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
+        selectionType:"radio",
+        mapList:[]
+      }
     };
   },
   mounted() {
@@ -33,10 +72,18 @@ export default {
     this.information();
   },
   methods: {
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.carrierName=this.mapList.carrierName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    },
     information() {
       //编辑 
 console.log(this.$route.params)            
-
+     
       this.axios
         .post(
           "/api/v1/rms/getCapacityById/" +
@@ -51,7 +98,16 @@ console.log(this.$route.params)
             console.log(e);
             console.log(this.form1);
             console.log( this.$route.params.capacityId);
-          });
+          }); 
+ this.axios
+        .post(
+          "/api/v1/rms/getCarrierNameById/" +
+          this.$route.params.capacityId
+        )
+        .then((res) => {
+          this.carrierName=res.data.data.carrierName
+          console.log("carrierName",this.carrierName);
+        }); 
         });
     },
     // 返回
@@ -69,7 +125,7 @@ console.log(this.$route.params)
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.form1.carrierId,
+         carrierId:this.mapList.carrierId,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||
@@ -125,4 +181,12 @@ console.log(this.$route.params)
       margin-right: 10px;
     }
  }
+ .disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.5rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editCarDriver.vue

@@ -9,8 +9,34 @@
           <dil-form :formId="340" v-model="form1"></dil-form>
       </div>
     </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
+     <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+<div class="disableBox">
+  <el-form-item>
+    <el-input v-model="carrierName" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
+  </el-form-item>
+  </div>
+   </el-form>
+    </div>
+  <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+</el-drawer>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
@@ -23,7 +49,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
       form1: {},
+     carrierName:"",
+ options:{
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
+        selectionType:"radio",
+        mapList:[]
+      }
     };
   },
   mounted() {
@@ -31,6 +66,14 @@ export default {
     this.information();
   },
   methods: {
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.carrierName=this.mapList.carrierName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    },
     information() {
       //编辑
       this.axios
@@ -47,6 +90,15 @@ export default {
             console.log(this.$route.params.driverId);
           });
         });
+    this.axios
+        .post(
+          "/api/v1/rms/getCarrierNameByDriverId/" +
+          this.$route.params.driverId
+        )
+        .then((res) => {
+          this.carrierName=res.data.data.carrierName
+          console.log("carrierName",this.carrierName);
+        }); 
     },
     // 返回
     onClickCancel() {
@@ -63,7 +115,7 @@ export default {
        driverIdentityCard:this.form1.driverIdentityCard,
        driverPhone:this.form1.driverPhone,
        transportTypeId:this.form1.transportTypeId,
-       carrierId:this.form1.carrierId,
+       carrierId:this.mapList.carrierId,
        driverPermitNo:this.form1.driverPermitNo,
        driverLicence:this.form1.driverLicence,
        driverLicence:this.form1.driverLicence,
@@ -137,4 +189,12 @@ export default {
       margin-right: 10px;
     }
   }
+  .disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.5rem;
+  margin-bottom: 1.25rem;
+}
 </style>