资源管理提交

build/utils.js

@@ -27,16 +27,16 @@ 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 = ['all'];
 //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 = ['index','inward','appoint','sale']
 
-
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

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

src/components/DilCommonUI/packages/form/src/form-item.vue

@@ -168,4 +168,5 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+</style>

src/config/routerBefore.js

@@ -105,9 +105,9 @@ const routerBefore = function (router, constantRouterMap) {
     store.commit('breadcrumb', breadcrumbFn(to, store.state.routes));
     //  标题
     if (to.meta && !to.meta.title) {
-      // document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
+      document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
     } else {
-      // document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
+      document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
     }
     if (to.query.ticket) {
       setCookie('ticket', to.query.ticket, '', '/');

src/views/RMS/components/addCapacity.vue

@@ -2,18 +2,18 @@
   <!-- 添加运力信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <!-- <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>
+
+     <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
         class="input"
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
+        placeholder="边输入边查询"
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
@@ -41,8 +41,64 @@ export default {
   },
   mounted() {},
   methods: {
-    onInput() {
-      this.axios
+     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.form1)
+       let RmsCapacity={
+         capacityTypeId:this.form1.capacityTypeId,
+         capacityNumber:this.form1.capacityNumber.toUpperCase(),
+         number:this.capacityNumber,
+         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,
+       };
+      //  console.log("RmsCapacity",RmsCapacity)
+       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/getCarrierName?state=" + this.state)
         .then((res) => {
           if (res.data.code == "200") {

src/views/RMS/components/addCarDriver.vue

@@ -3,7 +3,7 @@
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
     <el-divider content-position="left">司机信息</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
+    <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
     </div>
     <div class="inputBox">
@@ -12,31 +12,74 @@
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
+        placeholder="边输入边查询"
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
       </div>
     <div class="photoBox">
    <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> 
+    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="button-box">
+
+      <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">
+>>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -58,7 +101,11 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      sex: "男",
+      imageUrl1:"",
+      imageUrl2:"",
+      imageUrl3:"",
+      imageUrl4:"",
+      imageUrls:[],
     };
   },
   mounted() {
@@ -96,8 +143,37 @@ export default {
       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);
     },
@@ -174,50 +250,59 @@ 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: -12.5rem;
-}
-.photoBox{
+.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;
+          }
+      }
+    }
+  }
+  .photoBox{
    display: flex;
   text-align: center;
   align-items: center;
   justify-content: center;
   margin-top: 0.1000rem;
   margin-bottom: 0.25rem;
-  margin-left: -18rem;
+ // margin-left: -18rem;
 }
-.form-box{
-  display:flex;
-  justify-content: center;
-  .el-form-item{
-    display:flex;
+  .inputBox{
+    display: flex;
     justify-content: center;
-    .el-form-item__label{
-      display:flex;
+    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;
     }
   }
-  
 }
 </style>

src/views/RMS/components/addCarrier.vue

@@ -248,35 +248,39 @@ 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;
-}
-.form-box{
-  display: flex;
-  justify-content: center;
-  .el-form-item{
+ .button-box{
     display: flex;
-    width: 350px;
     justify-content: center;
-    
-    .el-form-item__label{
-      display: flex;
-      align-items: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
-        }
+  }
+  .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;
+          }
+      }
+      .el-radio{
+        width: 25px;
       }
     }
   }
-}
 .upload-demo{
   display: flex;
   justify-content: center;

src/views/RMS/components/addConsignee.vue

@@ -75,31 +75,34 @@ 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;
-}
-.form-box{
-  display: flex;
-  justify-content: center;
-  .el-form-item{
+  .button-box{
     display: flex;
     justify-content: center;
-    .el-form-item__label{
-      display: flex;
-      align-items: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
-        }
+  }
+.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;
+          }
       }
     }
   }
-}
 </style>

src/views/RMS/components/addGatepost.vue

@@ -84,14 +84,14 @@ export default {
 
 </style>
 <style lang='scss' >
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .btn-left {
   margin-left: 470px;
 }

src/views/RMS/components/addMaterial.vue

@@ -122,22 +122,21 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .disableBox{
   display: flex;
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 3rem;
+  margin-top: 1.5rem;
   margin-bottom: 1.25rem;
-  margin-left: -23rem;
 }
 .btn-left {
   margin-left: 470px;
@@ -145,27 +144,6 @@ export default {
 .input {
   margin-left: 90px;
 }
-.label{
-  margin-left: 445px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  padding-left: -30px;
-  font-family:Arial, Helvetica, sans-serif;
-  margin-bottom:20px;
-} 
-.label2{
-  margin-left: 425px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  font-family:Arial, Helvetica, sans-serif
-}
-.label1{
-  margin-left: 345px;
-  margin-bottom: -30px;
-  font: bold;
-}
 .common{
   font-weight: 700;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,

src/views/RMS/components/addNotice.vue

@@ -68,12 +68,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addOilPrice.vue

@@ -65,14 +65,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPersonnel.vue

@@ -81,14 +81,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPier.vue

@@ -82,4 +82,12 @@ export default {
     }
   }
 }
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addPort.vue

@@ -65,14 +65,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPortStorageYard.vue

@@ -67,12 +67,12 @@ export default {
   display: flex;
 }
 .form-box,
-.button-box{
+ .button-box{
     display: flex;
-    text-align: center;
-    align-items: center;
     justify-content: center;
-    margin-top: 0.3125rem;
-    margin-bottom: 1.25rem;
-}
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addRawWarehouse.vue

@@ -63,14 +63,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addRmsShipper.vue

@@ -75,14 +75,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addSupplier.vue

@@ -69,14 +69,14 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addTruckCalculate.vue

@@ -114,21 +114,25 @@ 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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .inputBox{
   display: flex;
   text-align: center;
   align-items: center;
-  justify-content: center;
    margin-top: 2rem;
-  width: 400px;
+   width: 800px;
+  .el-input__inner{
+    display: flex;
+  text-align: center;
+  align-items: center;
+  }
 }
 .btn-left {
   margin-left: 470px;

src/views/RMS/components/editCapacity.vue

@@ -1,22 +1,21 @@
 <template>
   <!-- 修改运力信息 -->
+<div class="addWagonLoad">
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
     </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+      <div class="form_box" style="margin-right: 10rem">
           <dil-form :formId="310" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
-
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
+</div>
 </template>
 
 <script>
@@ -96,13 +95,34 @@ console.log(this.$route.params)
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .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;
+          }
+      }
+    }
+ }
+ .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+ }
 </style>

src/views/RMS/components/editCarDriver.vue

@@ -5,13 +5,10 @@
     <div class="main">
     </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+      <div class="form_box">
           <dil-form :formId="340" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
-
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
@@ -96,13 +93,48 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+  .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;
+    margin-bottom: 30px;
+    .text{
+      text-align: right;
+      display: flex;
+      align-items: center;
+      margin-right: 5px;
+    }
+    .input{
+      width: 250px;
+    }
+  }
+.button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editCarrier.vue

@@ -6,9 +6,7 @@
     </div>
     <div class="contractTitle">
       <div class="form-box">
-        <div class="form-one">
           <dil-form :formId="330" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
 
@@ -170,13 +168,37 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
+ .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;
+          }
+      }
+       .el-radio{
+        width: 25px;
+      }
+    }
+  }
 .button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editConsignee.vue

@@ -99,13 +99,37 @@ console.log(this.$route.params)
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
+ .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;
+          }
+      }
+       .el-radio{
+        width: 25px;
+      }
+    }
+  }
 .button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editGatepost.vue

@@ -295,5 +295,13 @@ export default {
   margin-left: 35rem;
   margin-bottom: 0.25rem;
 }
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 
 </style>

src/views/RMS/components/editMaterial.vue

@@ -98,12 +98,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editNotice.vue

@@ -87,14 +87,14 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>
 
 

src/views/RMS/components/editOilPrice.vue

@@ -86,12 +86,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editPersonnel.vue

@@ -91,12 +91,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editRawWarehouse.vue

@@ -80,12 +80,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editRmsShipper.vue

@@ -91,14 +91,14 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .button-box{
   display: flex;
   justify-items: center;

src/views/RMS/components/editSupplier.vue

@@ -91,12 +91,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .form-box,
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editTruckCalculate.vue

@@ -234,19 +234,17 @@ makeSure() {
   text-align: center;
   align-items: center;
   justify-content: center;
-  width: 400px;
-}
-.inputBox{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  width: 400px;
-}
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
+  width: 800px;
 }
+
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .btn-left {
   margin-left: 470px;
 }

src/views/RMS/components/rawWarehouse.vue

@@ -46,13 +46,13 @@ export default {
       inputText:"",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getWarehouseList?apiId=345",
+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=345&con="+this.inputText;
+      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=415&con="+this.inputText;
     },
      toInsert() {
       this.$router.push("/addRawWarehouse");

src/views/appoint/components/purchase/purchaseOrder.vue

@@ -28,7 +28,7 @@ export default {
       state: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
+        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
       },
     };
   },

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售订单 -->
   <div class="addSalePlan">
     <page-title>新增</page-title>
-    <el-divider content-position="left">销售订单</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="284" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/appoint/components/saleContract/addSaleOrderArrange.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售订单排车 -->
   <div class="addSalePlan">
     <page-title>新增销售订单排车</page-title>
-
     <div class="table_form from">
       <div class="materialId">
         <span class="text"> 物资： </span>

src/views/appoint/components/saleContract/addSalePlan.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售计划 -->
   <div class="addSalePlan">
     <PageTitle>新增</PageTitle>
-    <el-divider content-position="left">销售计划</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="281" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -2,7 +2,6 @@
   <!-- 添加汽运单价 -->
   <div class="addSalePlan">
     <page-title>新增</page-title>
-    <el-divider content-position="left">汽运单价</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/configManager/app.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta content="智慧物流平台" name="keywords">
     <meta content="智慧物流平台" name="description">
-    <title>首页1 - 智慧物流平台</title>
+    <title>首页 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>

src/views/homepage/components/homepage.vue

@@ -1,15 +1,84 @@
 <template>
-  <div>首页
-      
+  <div>
+    首页
+    <el-button @click="onClick">ces1</el-button>
   </div>
 </template>
 
 <script>
 export default {
-
-}
+  methods: {
+    onClick() {
+      let data = {
+        userId: "",
+        userCode: "A12345",
+        userName: "A12345",
+        qrCode: "",
+        sex: "",
+        age: "",
+        cardNo: "",
+        birthDate: "",
+        nativePlace: "",
+        orgCode: "yunli",
+        orgName: "运力",
+        dep: "",
+        workTeam: "",
+        profilePhoto: "",
+        photo: "",
+        mobile: "13487481520",
+        qq: "",
+        wechat: "",
+        tel: "",
+        email: "213213@qq.com",
+        homeAddr: "",
+        entryDate: "",
+        workDate: "",
+        political: "",
+        title: "",
+        degree: "",
+        major: "",
+        gradSchool: "",
+        ability: "",
+        tranHis: "",
+        certificate: "",
+        special: "",
+        assessment: "",
+        leaveStatus: "",
+        onlineStatus: "",
+        status: "",
+        remark: "",
+        expireDays: "",
+        leave: "",
+        address: "",
+        ip: "",
+        rank: "",
+        responsibility: "",
+        groupData: "",
+        companyData: "",
+        groupId: "506514577756917769",
+        companyId: "713710108567277568",
+        photoType: "",
+        orgId: "922512907093282816",
+      };
+      this.store.dispatch("system/usersManage/addUser", data).then((res) => {
+        console.log(res);
+        if (res.code === "0") {
+          if (this.qrRole.length > 0) {
+            this.addRoleToUser(res.data.userId, res.data.userCode);
+          }
+          if (form.dutys.length > 0) {
+            this.addUserDutys(res.data.userId, form.dutys);
+          }
+          this.$message.success("添加成功");
+          this.$emit("on-then", "success", form);
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>

src/views/index/app.html

@@ -8,7 +8,7 @@
     <meta content="智慧物流平台" name="description">
     <title>登录 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
-    <!-- <link href="../static/img/favicon.ico" rel="shortcut icon"/> -->
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
     <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
     <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>

src/views/sale/components/dilNotice/addNotice.vue

@@ -0,0 +1,71 @@
+
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="369" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/dilNotice/carrierNotice.vue

@@ -0,0 +1,148 @@
+//公告管理
+<template>
+  <div class="notice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="noticeDetail(scope)"
+            >
+              详情
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="updateNotice(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteNotice(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/ams/getCarrierNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    toInsert() {
+      this.$router.push("/addNotice");
+
+    },
+
+    /*通知详情*/
+
+    noticeDetail(scope) {
+      console.log(scope.row.noticeId)
+      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+
+    },
+
+    /*这里要改一改*/
+    updateNotice(scope){
+      console.log(scope.row.noticeId)
+      this.$router.push("/editNotice/"+scope.row.noticeId)
+    },
+    deleteNotice(scope){
+      console.log(scope)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          console.log("enter")
+          this.axios
+            .post("/api/v1/ams/deleteNotice/" + scope.row.noticeId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+
+}
+
+</script>
+
+<style lang="scss" scode>
+.notice{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/clientNotice.vue

@@ -0,0 +1,148 @@
+//公告管理
+<template>
+  <div class="notice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="noticeDetail(scope)"
+            >
+              详情
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="updateNotice(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteNotice(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/ams/getClientNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getClientNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    toInsert() {
+      this.$router.push("/addNotice");
+
+    },
+
+    /*通知详情*/
+
+    noticeDetail(scope) {
+      console.log(scope.row.noticeId)
+      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+
+    },
+
+    /*这里要改一改*/
+    updateNotice(scope){
+      console.log(scope.row.noticeId)
+      this.$router.push("/editNotice/"+scope.row.noticeId)
+    },
+    deleteNotice(scope){
+      console.log(scope)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          console.log("enter")
+          this.axios
+            .post("/api/v1/ams/deleteNotice/" + scope.row.noticeId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+
+}
+
+</script>
+
+<style lang="scss" scode>
+.notice{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/editNotice.vue

@@ -0,0 +1,120 @@
+<template>
+  <!-- 修改通知信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">通知信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="369" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+
+
+
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let DilNotice = {
+        noticeId:this.form1.noticeId,
+        insertTime:this.form1.insertTime,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+
+      };
+      this.axios
+        .post(
+          "/api/v1/ams/updateNotice",
+          DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+<style>
+
+.el-textarea__inner{
+/*  width: 300px !important;*/
+  min-height:250px !important;
+}
+
+
+</style>
+
+
+
+

src/views/sale/components/dilNotice/getNoticeById.vue

@@ -0,0 +1,101 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+<!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="369" v-model="form1" ref="from1" autosize></dil-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  name:"homeworkPath",
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+
+
+
+
+  methods: {
+    information() {
+
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/ams/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          }
+          );
+        });
+
+
+      },
+
+  },
+
+}
+
+</script>
+
+<style>
+
+/* .el-textarea .el-input--medium .is-disabled  {
+:rows="10"
+} */
+
+
+.el-textarea__inner{
+  font-size: 15px !important;
+  height:200px !important;
+
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+
+<!--<el-input id="FormGroup_1639361270400"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+
+>
+</el-input>-->
+

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -0,0 +1,149 @@
+//公告管理
+<template>
+  <div class="notice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+
+
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="noticeDetail(scope)"
+            >
+              详情
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="updateNotice(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteNotice(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/ams/getMarketingNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    toInsert() {
+      this.$router.push("/addNotice");
+
+    },
+
+    /*通知详情*/
+
+    noticeDetail(scope) {
+      console.log(scope.row.noticeId)
+      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+
+    },
+
+    /*这里要改一改*/
+    updateNotice(scope){
+      console.log(scope.row.noticeId)
+      this.$router.push("/editNotice/"+scope.row.noticeId)
+    },
+    deleteNotice(scope){
+      console.log(scope)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          console.log("enter")
+          this.axios
+            .post("/api/v1/ams/deleteNotice/" + scope.row.noticeId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+
+}
+
+</script>
+
+<style lang="scss" scode>
+.notice{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/newNotice.vue

@@ -0,0 +1,91 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+    <!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="369" v-model="form1" ref="from1" autosize></dil-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  name:"homeworkPath",
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+
+
+
+
+  methods: {
+    information() {
+
+      //这里包含
+      this.axios
+        .post(
+          "/api/v1/ams/getNewNoticeByPermission/" +this.$route.params.permissions
+
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+              this.form1 = e;
+              console.log(e);
+              console.log(this.form1);
+              console.log(this.$route.params.noticeId);
+            }
+          );
+        });
+
+
+    },
+
+  },
+
+}
+
+</script>
+
+<style>
+
+/* .el-textarea .el-input--medium .is-disabled  {
+:rows="10"
+} */
+
+
+.el-textarea__inner{
+  font-size: 15px !important;
+  height:200px !important;
+
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/transport_appointment/openDistributionSection.vue

@@ -43,7 +43,7 @@
     </el-drawer>
 
     <el-drawer title="选择车" :visible.sync="drawer" :direction="direction" :before-close="handleClose"
-				:modal="false" size="30%" style="margin-top: 5.625rem;">
+				:modal="false" size="30%" style="margin-top: 2.625rem;">
         <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:160px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick2()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -109,7 +109,7 @@ export default {
     // 根据运输订单id查询物资信息
     getMaterial(orderId) {
       this.axios
-        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
           this.tableData = res.data.data;
         });

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -109,7 +109,7 @@ export default {
     // 根据运输订单id查询物资信息
     getMaterial(orderId) {
       this.axios
-        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
           this.tableData = res.data.data;
         });

src/views/sale/components/transport_excute/qualityResult.vue

@@ -24,7 +24,7 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getQualityResult?apiId=111&orderType=1",
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=1",
             },
         }
     },

src/views/sale/components/transport_order/receiveOrder.vue

@@ -36,15 +36,15 @@
 				inputText: "",
 				first: {
 					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=73",
 				},
 				second: {
 					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=73",
 				},
 				third: {
 					// second请求数据的地址
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=73",
 				},
 				activeName: "first",
 			}

src/views/sale/router/index.js

@@ -43,9 +43,18 @@ import directionalDispatch from '../components/transport_appointment/directional
 import openDistribution from '../components/transport_appointment/openDistribution.vue'
 import openDistributionSection from '../components/transport_appointment/openDistributionSection.vue'
 import orderGrabbing from '../components/transport_appointment/orderGrabbing.vue'
-import add_sale_dilNotice from '../components/transport_excute/dilNotice/add_sale_dilNotice.vue'
-import Carrier_dilNotice from '../components/transport_excute/dilNotice/Carrier_dilNotice.vue'
-import sale_dilNotice from '../components/transport_excute/dilNotice/sale_dilNotice.vue'
+
+import add_sale_dilNotice from '../components/dilNotice/add_sale_dilNotice.vue'
+import Carrier_dilNotice from '../components/dilNotice/Carrier_dilNotice.vue'
+import sale_dilNotice from '../components/dilNotice/sale_dilNotice.vue'
+import addNotice from '../components/dilNotice/addNotice.vue'
+import carrierNotice from '../components/dilNotice/carrierNotice.vue'
+import clientNotice from '../components/dilNotice/clientNotice.vue'
+import editNotice from '../components/dilNotice/editNotice.vue'
+import getNoticeById from '../components/dilNotice/getNoticeById.vue'
+import marketingNotice from '../components/dilNotice/marketingNotice.vue'
+import newNotice from '../components/dilNotice/newNotice.vue'
+
 import outFactoryResult from '../components/transport_excute/outFactory/outFactoryResult.vue'
 import smsResult from '../components/transport_excute/outFactory/smsResult.vue'
 import arrivalPhoto from '../components/transport_excute/tms-offsite/arrivalPhoto.vue'
@@ -136,9 +145,18 @@ const constantRouterMap = [
 		{path: 'openDistribution', name: 'openDistribution', meta: {code: 'xtpzgl-yhgl'}, component: openDistribution},
 		{path: 'openDistributionSection/:dispatchId', name: 'openDistributionSection', meta: {code: 'xtpzgl-yhgl'}, component: openDistributionSection},
 		{path: 'orderGrabbing', name: 'orderGrabbing', meta: {code: 'xtpzgl-yhgl'}, component: orderGrabbing},
+
 		{path: 'add_sale_dilNotice', name: 'add_sale_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: add_sale_dilNotice},
 		{path: 'Carrier_dilNotice', name: 'Carrier_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: Carrier_dilNotice},
 		{path: 'sale_dilNotice', name: 'sale_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: sale_dilNotice},
+		{path: 'addNotice', name: 'addNotice', meta: {code: 'xtpzgl-yhgl'}, component: addNotice},
+		{path: 'carrierNotice', name: 'carrierNotice', meta: {code: 'xtpzgl-yhgl'}, component: carrierNotice},
+		{path: 'clientNotice', name: 'clientNotice', meta: {code: 'xtpzgl-yhgl'}, component: clientNotice},
+		{path: 'editNotice/:noticeId', name: 'editNotice', meta: {code: 'xtpzgl-yhgl'}, component: editNotice},
+		{path: 'getNoticeById/:noticeId', name: 'getNoticeById', meta: {code: 'xtpzgl-yhgl'}, component: getNoticeById},
+		{path: 'marketingNotice', name: 'marketingNotice', meta: {code: 'xtpzgl-yhgl'}, component: marketingNotice},
+		{path: 'newNotice', name: 'newNotice', meta: {code: 'xtpzgl-yhgl'}, component: newNotice},
+
 		{path: 'outFactoryResult', name: 'outFactoryResult', meta: {code: 'xtpzgl-yhgl'}, component: outFactoryResult},
 		{path: 'smsResult', name: 'smsResult', meta: {code: 'xtpzgl-jggl'}, component: smsResult},
 		{path: 'arrivalPhoto', name: 'arrivalPhoto', meta: {code: 'xtpzgl-yhgl'}, component: arrivalPhoto},

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchaseAccessoriesMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/systemConfig/components/organizManage.vue

@@ -1,22 +1,6 @@
 <template>
   <div class="organizManage-main">
     <div class="organizManage-mainLeft">
-      <!-- 下拉选择公司 -->
-      <!-- <div class="_company-select" v-if="companys !== '' && companys.length > 1">
-                <el-dropdown
-                    trigger="click"
-                    @command="selectComPany"
-                >
-                    <span class="el-dropdown-link">
-                        {{companyName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown">
-                        <div v-for="item in companys" :key="item.id">
-                            <el-dropdown-item :command="item">{{item.companyName}}</el-dropdown-item>
-                        </div>
-                    </el-dropdown-menu>
-                </el-dropdown>
-            </div> -->
       <div class="public-function-div">
         机构树
         <el-button
@@ -26,18 +10,6 @@
           class="orgShowHidden"
           >{{ isAllDataShow ? "显示停用组织" : "隐藏停用组织" }}</el-button
         >
-        <!-- <el-button
-                    @click="setCheckedNodes"
-                    type="success"
-                    size="small"
-                    class="refresh"
-                >展开</el-button>
-                <el-button
-                    @click="setCheckedKeys"
-                    type="success"
-                    size="small"
-                    class="refresh2"
-                >收起</el-button> -->
         <el-button
           @click="controllNode()"
           type="success"
@@ -183,20 +155,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构类别"
-                          prop="cate">
-              <el-select v-model="formItem.cate"
-                         style="width: 100%;"
-                         size="small"
-                         @change="changeval">
-                <el-option v-for="item in dataDictionary.state.dict.CATE"
-                           :value="item.value"
-                           :key="item.value"
-                           :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构编码" prop="orgCode">
               <el-input
@@ -207,13 +165,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构级别" prop="rank">
-              <el-select v-model="formItem.rank" style="width: 100%;" size="small">
-                <el-option v-for="item in formItemRank" :value="item.value" :key="item.value"  :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构名称" prop="orgName">
               <el-input
@@ -1205,7 +1156,12 @@ export default {
                     form: data,
                   })
                   .then((res) => {
-                    //
+                    console.log(res,'修改成功')
+                    console.log(res.data.orgId,'机构主键id');
+                    console.log(res.data.depType,"机构级别");
+                    console.log(res.data.orgName,"机构名称");
+                    console.log(res.data.pId,"父级机构id");
+                    
                     this.addLoading1 = false;
                     //
                     if (res.code === "0") {
@@ -1251,6 +1207,11 @@ export default {
             this.store
               .dispatch("system/organizManage/addOrg", data)
               .then((res) => {
+                console.log(res,'添加成功')
+                console.log(res.data.orgId,'机构主键id');
+                console.log(res.data.depType,"机构级别");
+                console.log(res.data.orgName,"机构名称");
+                console.log(res.data.pId,"父级机构id");
                 //
                 this.addLoading2 = false;
                 //

src/views/systemConfig/components/usersAddAndEdit.vue

@@ -616,7 +616,7 @@
                 style="float: right"
                 @click="formSubmit"
                 size="small"
-                >保 存</el-button
+                >保 存1</el-button
               >
               <el-button
                 plain