资源管理提交

build/utils.js

@@ -27,13 +27,13 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
  //let devModules = ['all'];
-// let devModules = ['index','RMS']
+let devModules = ['index','RMS']
 //let devModules = ['index','SporadicManage','TMS']
 // let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 // let devModules = ['index','inward','SporadicManage']
-let devModules = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
 
 

config/index.js

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

src/views/RMS/components/addCapacity.vue

@@ -2,13 +2,14 @@
   <!-- 添加运力信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">运力信息</el-divider>
-     <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-divider content-position="left">运力信息</el-divider> -->
+    <div class="form_box" style="margin-right: 160px">
+      <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="inputBox">
+      <span class="text">所属单位类型</span>
       <el-autocomplete
+        class="input"
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
@@ -16,8 +17,8 @@
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
-      </div>
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -33,87 +34,89 @@ export default {
     return {
       form1: {},
       // value: undefined,
-     carrierIds:"",
+      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={
-         capacityTypeId:this.form1.capacityTypeId,
-         capacityNumber:this.form1.capacityNumber.toUpperCase(),
-         capacityCorlor:this.form1.capacityCorlor,
-         capacityOwneris:this.form1.capacityOwneris,
-         capacityVip:this.form1.capacityVip,
-         capacityBlacklist:this.form1.capacityBlacklist,
-        // carrierId:this.form1.carrierId,
-        state:this.state,
-        carrierName:this.state,
-        carrierIds: this.carrierIds,
-       };
-       if(
-         RmsCapacity.capacityNumber==null ||
-         RmsCapacity.capacityCorlor==null ||
-         RmsCapacity.capacityOwneris==null ||
-         RmsCapacity.capacityVip==null ||
-         RmsCapacity.capacityBlacklist==null ||
-         RmsCapacity.carrierIds==null
-       )this.$message.error("存在空值！");
-       else
+    onInput() {
       this.axios
-        .post(
-          "/api/v1/rms/insertCapacity", RmsCapacity
-        )
+        .post("/api/v1/rms/getCarrierName?state=" + this.state)
         .then((res) => {
-          console.log("res.data.code",res.data.code);
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
+          if (res.data.code == "200") {
+            res.data.data.forEach((element) => {
+              this.restaurants.push({
+                value: element.carrierName,
+                carrierIds: element.carrierId,
+              });
             });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
           }
-          // this.$refs['table'].resetField();
         });
     },
+    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 = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        // carrierId:this.form1.carrierId,
+        state: this.state,
+        carrierName: this.state,
+        carrierIds: this.carrierIds,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null ||
+        RmsCapacity.carrierIds == null
+      )
+        this.$message.error("存在空值！");
+      else
+        this.axios
+          .post("/api/v1/rms/insertCapacity", RmsCapacity)
+          .then((res) => {
+            console.log("res.data.code", res.data.code);
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败,可能存在重复！");
+            }
+            // this.$refs['table'].resetField();
+          });
+    },
     // 取消
     cancel() {
       this.$router.go(-1);
@@ -122,39 +125,49 @@ export default {
 };
 </script>
 <style lang='scss' >
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  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;
-  .el-form-item{
+.addWagonLoad {
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    display: flex;
+    justify-content: center;
+    .el-form-item{
+      display: flex;
+      justify-content: center;
+      .el-form-item__label{
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content{
+         .el-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+  }
+  .inputBox{
     display: flex;
     justify-content: center;
-    .el-form-item__label{
+    margin-bottom: 30px;
+    .text{
+      text-align: right;
       display: flex;
       align-items: center;
+      margin-right: 5px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
-        }
-      }
+    .input{
+      width: 250px;
+    }
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
   }
 }

src/views/RMS/components/addCarDriver.vue

@@ -19,65 +19,23 @@
       </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="handleAvatarSuccess"
-  :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="handleAvatarSuccess"
-  :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="handleAvatarSuccess"
-  :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="handleAvatarSuccess"
-  :file-list="fileList"
-  list-type="picture">
-  <div>从业资格证照片
-  <el-button size="small" type="primary">点击上传</el-button>
-  </div>
-</el-upload> 
+      class="upload-demo"
+      action="https://jsonplaceholder.typicode.com/posts/"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :before-remove="beforeRemove"
+      multiple
+      :limit="1"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <div>驾驶证
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">
+      </div>
+      </div>
+    </el-upload> 
     </div>
-
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -100,10 +58,12 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      imageUrl:"",
+      sex: "男",
     };
   },
-  mounted() {},
+  mounted() {
+     this.form1.driverSex = this.sex;	
+},
   methods: {
     onInput() {
       this.axios.post(
@@ -136,16 +96,24 @@ 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);
-      },
-      handlePreview(file) {
-        console.log(file);
-      },
-  
+      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);
       let reg = new RegExp(/^[0-9]*$/);
@@ -156,7 +124,11 @@ 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,
@@ -175,7 +147,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-    
+     //   RmsCarDriver.carrierId==null 
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -191,7 +163,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          //this.$refs['table'].resetField();
+          this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -224,7 +196,7 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 1rem;
+  margin-top: 0.1000rem;
   margin-bottom: 0.25rem;
   margin-left: -18rem;
 }

src/views/RMS/components/addCarrier.vue

@@ -8,36 +8,40 @@
       </div>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
       :before-upload="beforeUpload2"
+      :on-progress="onProgress"
+      :auto-upload="false"
       list-type="picture">
       <el-button size="small" type="primary">点击上传运输证</el-button>
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess2"
       :file-list="fileList"
       :before-upload="beforeUpload2"
+      :auto-upload="false"
       list-type="picture">
       <el-button size="small" type="primary">点击上传经营许可证</el-button>
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess3"
       :file-list="fileList"
       :before-upload="beforeUpload2"
+      :auto-upload="false"
       list-type="picture">
       <el-button size="small" type="primary">点击上传营业执照</el-button>
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
@@ -102,21 +106,25 @@ export default {
         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
         selectionType: "radio",
          mapList:[],
-         registerDate:"",
          mapValue:""
       },
-      imageUrl1:"",
-      imageUrl2:"",
-      imageUrl3:"",
-      imageUrls:[],
+      // 图片上传地址
+      fileList:[]
     };
   },
   methods: {
+    // onProgress(event, file, fileList){
+
+    //   console.log("event"+event)
+    //   console.log("file"+file)
+    //   console.log("fileList"+fileList)
+    // },
     beforeUpload2 (file) {
+        console.log("file",file)
         const isLt2M = file.size < 1024 * 1024 * 0.5
         console.log('大小' + isLt2M)
         if (!isLt2M) {
-          this.$message.error('上传文件大小不能超过500kb!')
+          this.$message.error('上传文件大小不能超过 500kb!')
         }
         let size = file.size / 1024
         console.log('大小' + size)
@@ -131,27 +139,6 @@ export default {
         img.src = _URL.createObjectURL(file)
         return isLt2M
     },
-    handleAvatarSuccess1(res,file){
-      this.imageUrl1=URL.createObjectURL(file.raw);
-      // this.axios
-      // .then((res) => {
-      //   if (res.data.code == 200) {
-      //     this.$message({
-      //     type: "success",
-      //     message: "新增成功!",
-      //     });
-      //   } 
-      //   else {
-      //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
-      //   }
-      // });
-    },
-    handleAvatarSuccess2(res,file){
-      this.imageUrl2=URL.createObjectURL(file.raw);
-    },
-    handleAvatarSuccess3(res,file){
-      this.imageUrl3=URL.createObjectURL(file.raw);
-    },
     handleRemove(file,fileList){
       console.log(file,fileList)
     },
@@ -168,6 +155,7 @@ export default {
      
     },
      makeSure() {
+      // console.log(this.$refs.upload.submit())
       let reg=new RegExp(/^[0-9]*$/);
       let RmsCarrier={
         carrierName:this.form1.carrierName,
@@ -195,16 +183,10 @@ export default {
       let registerDate={
         registerDate: this.form1.registerDate,
       };
-      let imageUrls={
-        imageUrl1:this.imageUrl1,
-        imageUrl1:this.imageUrl2,
-        imageUrl1:this.imageUrl3
-      };
-      console.log(imageUrls)
+      console.log("fileList"+this.fileList)
       let mapValue={
         RmsCarrier:RmsCarrier,
-        registerDate:registerDate,
-        imageUrls:imageUrls
+        registerDate:registerDate
       };
       if(
         reg.test(RmsCarrier.carrierContactNumber)==false
@@ -240,6 +222,7 @@ export default {
           .post(
             "/api/v1/rms/insertCarrier",
             mapValue
+            
           )
           .then((res) => {
             if (res.data.code == 200) {
@@ -247,6 +230,7 @@ export default {
                 type: "success",
                 message: "新增成功!",
               });
+              this.$refs.upload.submit();
               // this.$refs.table.refreshData();
               this.$router.go(-1);
             } else {
@@ -254,6 +238,7 @@ export default {
             }
             this.$refs['table'].resetField();
           });
+          
       },
       // // 取消
       cancel() {

src/views/RMS/components/addConsignee.vue

@@ -2,7 +2,6 @@
   <!-- 添加收货客户信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">收货客户信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="367" v-model="form1" ref="from1"></dil-form>
       </div>

src/views/RMS/components/addGatepost.vue

@@ -2,7 +2,6 @@
   <!-- 添加门岗信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">门岗信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
        <!-- 287 -->
         <dil-form :formId="328" v-model="form1" ref="from1">

src/views/RMS/components/addMaterial.vue

@@ -2,7 +2,6 @@
   <!-- 添加物资信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">物资信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
 

src/views/RMS/components/addNotice.vue

@@ -3,7 +3,6 @@
   <!-- 添加公告信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">公告信息</el-divider>
 
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="302" v-model="form1" ref="from1"></dil-form>

src/views/RMS/components/addOilPrice.vue

@@ -2,7 +2,6 @@
   <!-- 添加油价信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">油价信息</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="357" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/RMS/components/addPersonnel.vue

@@ -2,7 +2,6 @@
   <!-- 添加人员信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">人员信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="325" v-model="form1" ref="from1"></dil-form>
       </div>
@@ -36,8 +35,12 @@ export default {
         personnelWorkshopid: this.form1.personnelWorkshopid,
         personnelShifts: this.form1.personnelShifts,
         personnelTeam:this.form1.personnelTeam,
-        departmentId: this.form1.shipperId
+        departmentId: this.form1.shipperId,
+        username:this.form1.username
       };
+      let userName={
+
+      }
       if(
         RmsPersonnel.personnelJobNumber ==null ||
         RmsPersonnel.personnelName ==null ||
@@ -49,6 +52,9 @@ export default {
       )this.$message.error("存在空值！");
       else
       this.axios
+        .post(
+
+        )
         .post(
           "/api/v1/rms/insertPersonnel",
            RmsPersonnel

src/views/RMS/components/addRawWarehouse.vue

@@ -2,7 +2,6 @@
   <!-- 添加原料仓库信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">原料仓库信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="315" v-model="form1" ref="from1"></dil-form>
       </div>

src/views/RMS/components/addRmsShipper.vue

@@ -2,7 +2,6 @@
   <!-- 添加托运人信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">托运人信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
        <!-- 323 -->
         <dil-form :formId="323" v-model="form1" ref="from1"></dil-form>

src/views/RMS/components/addSupplier.vue

@@ -2,7 +2,6 @@
   <!-- 添加供应商信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">原料供应商信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="320" v-model="form1" ref="from1"></dil-form>
       </div>
@@ -31,7 +30,7 @@ export default {
       let RmsSupplier = {
         supplierName: this.form1.supplierName,
         supplierAddress: this.form1.supplierAddress,
-        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
+        supplierRegisterDate: this.form1.supplierRegisterDate,
         supplierContactsName: this.form1.supplierContactsName,
         supplierContactNumber: this.form1.supplierContactNumber
       };

src/views/RMS/components/addTruckCalculate.vue

@@ -2,7 +2,6 @@
   <!-- 添加汽车衡信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">汽车衡信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="317" v-model="form1" ref="from1">
         </dil-form>

src/views/RMS/components/editCapacity.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">运力信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editCarDriver.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">司机信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editCarrier.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">承运商信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -36,8 +35,8 @@
     </el-drawer>
 
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editConsignee.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">收货客户信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editMaterial.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">物资信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
     
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editNotice.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">通知信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editOilPrice.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">油价信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editPersonnel.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">人员信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editRawWarehouse.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">原料仓库信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editRmsShipper.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">托运人信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">

src/views/RMS/components/editSupplier.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">供应商信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>

src/views/RMS/components/editTruckCalculate.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">汽车衡信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -49,9 +48,9 @@
         </template>
       </el-table-column>
     </dilTable>
-       <div class="button-box">
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>  
   </div>
   </div>

src/views/RMS/components/getNoticeById.vue

@@ -63,9 +63,9 @@ export default {
 
 <style>
 
-.el-textarea .el-input--medium .is-disabled  {
-:rows="10"
-}
+/* .el-textarea .el-input--medium .is-disabled  {
+  /* rows="10" */
+/* } */ 
 
 
 .el-textarea__inner{

src/views/RMS/components/transitRoute.vue

@@ -132,12 +132,10 @@ export default {
 
 <style lang="scss" scode>
 .steel_inbound{
-  .sache{
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
+  .top{
+    display: flex;
+    width: 30%;
   }
+}
+
 </style>

src/views/RMS/components/transitRouteAdd.vue

@@ -10,7 +10,7 @@
       </div>
       <div class="link_name">
         <span>线路名称：</span>
-        <el-input placeholder="请输入内容" v-model="line_name" clearable>
+        <el-input placeholder="请输入内容" v-model="line_name" class="el_input_suffix" clearable>
         </el-input>
       </div>
       <div class="link_type">
@@ -107,6 +107,10 @@ export default {
           value: "4",
           label: "退货",
         },
+        {
+          value: "5",
+          label: "零星",
+        },
       ],
       value: "",
       btnList: [],
@@ -281,6 +285,11 @@ export default {
       align-items: center;
       justify-content: center;
       margin-top: 1.25rem;
+      .el_input_suffix{
+        widows: 50px;
+        
+      }
+      
     }
     .link_type {
       display: flex;

src/views/inward/app.js

@@ -19,12 +19,12 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
-import 'xe-utils' 
+// import 'xe-utils' 
 
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-Vue.use(VXETable)
-Vue.prototype.$XModal = VXETable.modal
+// import VXETable from 'vxe-table'
+// import 'vxe-table/lib/style.css'
+// Vue.use(VXETable)
+// Vue.prototype.$XModal = VXETable.modal
 
 
 // 关闭生产模式下给出的提示