tijiao

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
-//  let devModules = ['all']
-let devModules = ['index','SporadicManage','RMS','statisticalReport']
+ let devModules = ['all']
+// let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];

config/index.js

@@ -64,9 +64,10 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    target: "http://localhost:8019",
-    // target: "http://192.168.1.108:8080",
+   target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8080",
+    //  target: "http://localhost:8019",
+    // target: "http://192.168.1.107:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

package.json

@@ -26,7 +26,7 @@
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
-    "element-ui": "2.4.2",
+    "element-ui": "2.15.7",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
@@ -55,9 +55,9 @@
     "vue-splitpane": "^1.0.2",
     "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
-    "vxe-table": "^3.4.12",
+    "vxe-table": "^4.2.2-beta.1",
     "x2js": "^3.3.0",
-    "xe-utils": "^3.5.1",
+    "xe-utils": "^3.5.4",
     "xlsx": "^0.11.19",
     "xterm": "3.12.0"
   },

src/views/RMS/components/addCarrier.vue

@@ -1,26 +1,33 @@
 <template>
+
+
   <!-- 添加承运商信息 -->
   <div class="addCarrier">
     <PageTitle>返回</PageTitle>
     <div class="user_code">
       <span class="text">账号</span>
-      <el-input
-        class="input"
-        placeholder="请输入账号(必填项)"
-        v-model="input"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+        <el-input
+          class="input"
+          placeholder="请输入账号(必填项)"
+          v-model="input"
+          clearable
+        >
+        </el-input>
+      </div>
     </div>
     <div class="user_code">
       <span class="text">用户名</span>
-      <el-input
-        class="input"
-        placeholder="请输入用户名(必填项)"
-        v-model="user_Name"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+           <el-input
+            class="input"
+            placeholder="请输入用户名(必填项)"
+            v-model="user_Name"
+            clearable
+          >
+          </el-input>
+      </div>
+     
     </div>
     <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="330" v-model="form1"></dil-form>
@@ -28,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -51,7 +58,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier2"
+      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -74,7 +81,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier3"
+      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -202,16 +209,17 @@ export default {
       }
     },
     handleAvatarSuccess(res, file) {
+      console.log(res,file)
       if (res.code) {
         this.upBool = false;
         if (this.num == 1) {
-          this.imageUrl1 = URL.createObjectURL(file.raw);
+          this.imageUrl1 = res.data;
           this.shippingCertificate = file.name;
         } else if (this.num == 2) {
-          this.imageUrl2 = URL.createObjectURL(file.raw);
+          this.imageUrl2 = res.data;
           this.businessLicense = file.name;
         } else if (this.num == 3) {
-          this.imageUrl3 = URL.createObjectURL(file.raw);
+          this.imageUrl3 =res.data;
           this.businessLicense1 = file.name;
         }
         this.$message.success("上传成功");
@@ -229,7 +237,10 @@ export default {
       this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
       if (!this.input) {
         this.$message.error("账号不能为空");
-      } else if(!this.user_Name){
+      }else if(this.input.length<3){
+        this.$message.error("账号不能少于3位数！");
+      }
+       else if(!this.user_Name){
         this.$message.error("用户名不能为空");
       }else if (!this.form1.carrierName) {
         this.$message.error("承运商名称不能为空");
@@ -397,6 +408,15 @@ export default {
       width: 250px;
     }
   }
+  .site{
+    position: relative;
+    left: 32px;
+  }
+  span.text {
+    position: relative;
+    align-content: center;
+    left: -35px;
+  }
   .form-box {
     display: flex;
     justify-content: center;

src/views/RMS/components/carrier.vue

@@ -18,6 +18,10 @@
             <el-button type="text" size="small" @click="updateCarrier(scope)">
               修改
             </el-button>
+            <el-button type="text" size="small" @click="showCarrier(scope)">
+              查看详情
+            </el-button>
+
             <!-- <el-button type="text" size="mini" @click="deleteCarrier(scope)">
               删除
             </el-button> -->
@@ -51,6 +55,10 @@ export default {
       console.log(scope.row.settlementId);
       this.$router.push("/editCarrier/" + scope.row.carrierId);
     },
+    showCarrier(scope) {
+      console.log(scope.row.settlementId);
+      this.$router.push("/showCarrier/" + scope.row.carrierId);
+    },
     deleteCarrier(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",

src/views/RMS/components/showCarrier.vue

@@ -0,0 +1,231 @@
+<template>
+  <!-- 修改承运商信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+    </div>
+    <div class="contractimage">
+      <el-image 
+            style=" height:150px;text-align:center"
+            :src="src" 
+            :preview-src-list="srcList">
+          </el-image>
+          <el-image 
+            style=" height:150px;text-align:center"
+            :src="src1" 
+            :preview-src-list="srcList1">
+          </el-image>
+          <el-image 
+            style=" height:150px;text-align:center"
+            :src="src2" 
+            :preview-src-list="srcList2">
+          </el-image>
+    </div>
+    <div class="contractTitle">
+      <div class="form_box">
+          <dil-form :disabled=true :formId="330" v-model="form1">
+          </dil-form>
+         
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      direction2:"",
+      formInline:{},
+      isShow:false,
+      src:"",
+      srcList:[],
+      src1:"",
+      srcList1:[],
+      src2:"",
+      srcList2:[],
+      inputText:"",
+      form1: {},
+      registerDate:"",
+      mapValue:"",
+      drawer: false,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
+        selectionType: "radio",
+         mapList:[],
+         registerDate:"",
+         mapValue:""
+      },
+    };
+  },
+ 
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+
+  methods: {
+
+    
+    handleClose(){
+
+    },
+
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+    },
+    currentRadioChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.bidArea=this.mapList.bidArea
+     
+    },
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getCarrierById/" +
+            this.$route.params.carrierId
+        )
+        .then((res) => {
+            
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            this.srcList=[];
+            this.srcList1=[];
+            this.srcList2=[];
+            this.isShow=true;
+            this.src=e.carrierBusinessAblelicense;
+            this.srcList.push(e.carrierBusinessAblelicense);
+            this.src1=e.carrierBusinessLicense;
+            this.srcList1.push(e.carrierBusinessLicense);
+            this.src2=e.carrierTransportCertificate;
+            this.srcList2.push(e.carrierTransportCertificate);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {  
+       let RmsCarrier={
+        carrierId:this.$route.params.carrierId,
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.mapList.bidAreaId,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+      };
+       let registerDate={
+        registerDate: this.form1.registerDate,
+      };
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+      };
+       if(
+        RmsCarrier.carrierName ==null ||
+       // RmsCarrier.carrierTransportCertificate ==null ||
+       // RmsCarrier.carrierBusinessLicense ==null ||
+       // RmsCarrier.carrierBusinessAblelicense ==null ||
+        RmsCarrier.carrierAbbreviation ==null ||
+        RmsCarrier.carrierAddress ==null ||
+        RmsCarrier.registerNo ==null ||
+        RmsCarrier.carrierBidAreaId ==null || 
+        RmsCarrier.carrierLegalRepresentative ==null ||
+        RmsCarrier.registerCapital ==null ||
+        RmsCarrier.businessScope ==null ||
+        RmsCarrier.annualDate ==null ||
+        RmsCarrier.companyStatusDesc ==null ||
+        RmsCarrier.companyTypeDesc ==null ||
+        RmsCarrier.operationPeriod ==null ||
+        registerDate.registerDate ==null ||
+        RmsCarrier.registerOrganization ==null ||
+        RmsCarrier.registerAptitudes ==null ||
+        RmsCarrier.contactsName ==null ||
+        RmsCarrier.carrierContactNumber ==null ||
+        RmsCarrier.carrierType ==null ||
+        RmsCarrier.carrierTransportType ==null 
+      )this.$message.error("存在空值！");
+        this.axios
+          .post(
+            "/api/v1/rms/updateCarrier",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+
+  .contractimage{
+    text-align: center;
+    position: relative;
+    left: 85px;
+  }
+  .form_box {
+    display: flex;
+    justify-content: center;
+    margin-left: 170px;
+    margin-top: 15px;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        width: 250px;
+        .el-radio-group {
+          width: 500px;
+        }
+        .el-date-editor {
+          width: 250px;
+        }
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+.center{
+   display: flex;
+    justify-content: center;
+}
+.button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+</style>

src/views/RMS/router/index.js

@@ -52,6 +52,7 @@ import rawWarehouse from '../components/rawWarehouse.vue'
 import rmsShipper from '../components/rmsShipper.vue'
 import supplier from '../components/supplier.vue'
 import transitRoute from '../components/transitRoute.vue'
+import showCarrier from '../components/showCarrier.vue'
 import transitRouteAdd from '../components/transitRouteAdd.vue'
 import truckCalculate from '../components/truckCalculate.vue'
 import consignee from '../components/consignee.vue'
@@ -86,6 +87,7 @@ const constantRouterMap = [
 		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
+		{path: 'showCarrier/:carrierId', name: 'showCarrier', meta: {code: 'xtpzgl-yhgl'}, component: showCarrier},
 		{path: 'editConsignee/:consigneeId',name: 'editConsignee',meta:{code: 'xtpzgl-yhgl'},component: editConsignee},
 		{path: 'editGatepost/:gatepostId', name: 'editGatepost', meta: {code: 'xtpzgl-yhgl'}, component: editGatepost},
 		{path: 'editMaterial/:materialId', name: 'editMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editMaterial},

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
 
 
 // 关闭生产模式下给出的提示