12.23收货客户

build/utils.js

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

src/views/RMS/components/addCarDriver.vue

@@ -19,23 +19,61 @@
       </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://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :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://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :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://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :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://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  list-type="picture">
+  <div>从业资格证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -58,12 +96,10 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      sex: "男",
+     
     };
   },
-  mounted() {
-     this.form1.driverSex = this.sex;	
-},
+  mounted() {},
   methods: {
     onInput() {
       this.axios.post(
@@ -97,23 +133,13 @@ export default {
       console.log(item)
     },
    
-
     handleRemove(file, fileList) {
-      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}？`);
-    },
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+  
     makeSure() {
       console.log(this.form1);
       let reg = new RegExp(/^[0-9]*$/);
@@ -124,11 +150,7 @@ 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,
@@ -147,7 +169,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-     //   RmsCarDriver.carrierId==null 
+    
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -196,7 +218,7 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 0.1000rem;
+  margin-top: 1rem;
   margin-bottom: 0.25rem;
   margin-left: -18rem;
 }

src/views/RMS/components/addConsignee.vue

@@ -0,0 +1,105 @@
+<template>
+  <!-- 添加收货客户信息 -->
+  <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>
+    <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: {},
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log("enter11111111111111111111111")
+       console.log(this.form1)
+       let RmsConsignee={
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+              console.log("RmsConsignee",RmsConsignee)
+       if(
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+       else
+         this.axios
+          .post(
+            "/api/v1/rms/insertConsignee",
+            RmsConsignee
+          )
+          .then((res) => {
+            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);
+    },
+  },
+};
+</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{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/addRawWarehouse.vue

@@ -31,7 +31,7 @@ export default {
        console.log(this.from1)
        let RmsWarehouse = {
          warehouseName:this.form1.warehouseName,
-         shipperId:this.form1.shipperId 
+         shipperId:this.form1.shipperId,
        };
        if(
          RmsWarehouse.warehouseName==null ||

src/views/RMS/components/consignee.vue

@@ -1,14 +1,41 @@
 <template>
   <!-- 客户收货信息页面 -->
-  <div class="steel_inbound">
+   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        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="option">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateConsignee(scope.row.consigneeId)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteConsignee(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </div>
-    <dilTable v-bind.sync="option">
-    </dilTable>
   </div>
 </template>
 
@@ -31,6 +58,45 @@ export default {
     onclick() {
       this.option.requestUrl = "/api/v1/rms/getConsigneeList?apiId=407&con=" + this.input;
     },
+    toInsert() {
+      this.$router.push("/addConsignee");
+
+    },
+    updateConsignee(consigneeId){
+      this.$router.push("/editConsignee/" + consigneeId)
+    },
+    deleteConsignee(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteConsignee/" + scope.row.consigneeId)
+            .then((res) => {
+              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>

src/views/RMS/components/editConsignee.vue

@@ -0,0 +1,112 @@
+<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="368" 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() {
+      //编辑 
+console.log(this.$route.params)            
+
+      this.axios
+        .post(
+          "/api/v1/rms/getConsigneeById/" +
+            this.$route.params.consigneeId
+        )
+
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+           
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log( this.$route.params.consigneeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsConsignee={
+         consigneeId:this.form1.consigneeId,
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+       if(
+        RmsConsignee.consigneeId == null ||
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+        console.log( this.$route.params.consigneeId);
+        this.axios
+          .post(
+            "/api/v1/rms/updateConsignee",
+           RmsConsignee
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            
+            }
+          });
+    },
+  },
+};
+</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;
+}
+</style>

src/views/RMS/components/editRawWarehouse.vue

@@ -58,7 +58,8 @@ export default {
       console.log(this.form1)
        let RmsWarehouse={
       warehouseId:this.$route.params.warehouseId,
-      warehouseName:this.form1.warehouseName
+      warehouseName:this.form1.warehouseName,
+      shipperId:this.form1.shipperId,
     };
     if(
          warehouseName==null

src/views/RMS/router/index.js

@@ -8,6 +8,7 @@ import main from '@/components/main.vue'
 import addCapacity from '../components/addCapacity.vue'
 import addCarDriver from '../components/addCarDriver.vue'
 import addCarrier from '../components/addCarrier.vue'
+import addConsignee from '../components/addConsignee.vue'
 import addGatepost from '../components/addGatepost.vue'
 import addMaterial from '../components/addMaterial.vue'
 import addOilPrice from '../components/addOilPrice.vue'
@@ -27,6 +28,7 @@ import carrier from '../components/carrier.vue'
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
 import editCarrier from '../components/editCarrier.vue'
+import editConsignee from '../components/editConsignee.vue'
 import editGatepost from '../components/editGatepost.vue'
 import editMaterial from '../components/editMaterial.vue'
 import editOilPrice from '../components/editOilPrice.vue'
@@ -65,6 +67,7 @@ const constantRouterMap = [
 		{path: 'addCapacity', name: 'addCapacity', meta: {code: 'xtpzgl-jggl'}, component: addCapacity},
 		{path: 'addCarDriver', name: 'addCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: addCarDriver},
 		{path: 'addCarrier', name: 'addCarrier', meta: {code: 'xtpzgl-yhgl'}, component: addCarrier},
+		{path: 'addConsignee',name: 'addConsignee',meta: {code:'xtpzgl-yhgl'},component: addConsignee},
 		{path: 'addGatepost', name: 'addGatepost', meta: {code: 'xtpzgl-yhgl'}, component: addGatepost},
 		{path: 'addMaterial', name: 'addMaterial', meta: {code: 'xtpzgl-yhgl'}, component: addMaterial},
 		{path: 'addOilPrice', name: 'addOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: addOilPrice},
@@ -83,6 +86,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: '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},
 		{path: 'editOilPrice/:priceId', name: 'editOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: editOilPrice},