Explorar el Código

修改合并冲突

Your Name hace 3 años
padre
commit
7fe623e073
Se han modificado 31 ficheros con 506 adiciones y 356 borrados
  1. 2 1
      build/utils.js
  2. 74 17
      src/views/RMS/components/addCapacity.vue
  3. 33 17
      src/views/RMS/components/addCarDriver.vue
  4. 211 203
      src/views/RMS/components/addCarrier.vue
  5. 0 1
      src/views/RMS/components/addConsignee.vue
  6. 0 1
      src/views/RMS/components/addGatepost.vue
  7. 0 1
      src/views/RMS/components/addMaterial.vue
  8. 0 1
      src/views/RMS/components/addNotice.vue
  9. 0 1
      src/views/RMS/components/addOilPrice.vue
  10. 8 2
      src/views/RMS/components/addPersonnel.vue
  11. 0 1
      src/views/RMS/components/addRawWarehouse.vue
  12. 0 1
      src/views/RMS/components/addRmsShipper.vue
  13. 1 2
      src/views/RMS/components/addSupplier.vue
  14. 0 1
      src/views/RMS/components/addTruckCalculate.vue
  15. 2 4
      src/views/RMS/components/editCapacity.vue
  16. 2 4
      src/views/RMS/components/editCarDriver.vue
  17. 1 2
      src/views/RMS/components/editCarrier.vue
  18. 1 2
      src/views/RMS/components/editConsignee.vue
  19. 1 2
      src/views/RMS/components/editMaterial.vue
  20. 1 2
      src/views/RMS/components/editNotice.vue
  21. 1 2
      src/views/RMS/components/editOilPrice.vue
  22. 1 2
      src/views/RMS/components/editPersonnel.vue
  23. 1 2
      src/views/RMS/components/editRawWarehouse.vue
  24. 0 1
      src/views/RMS/components/editRmsShipper.vue
  25. 1 2
      src/views/RMS/components/editSupplier.vue
  26. 2 3
      src/views/RMS/components/editTruckCalculate.vue
  27. 3 3
      src/views/RMS/components/getNoticeById.vue
  28. 5 7
      src/views/RMS/components/transitRoute.vue
  29. 10 1
      src/views/RMS/components/transitRouteAdd.vue
  30. 5 5
      src/views/inward/app.js
  31. 140 62
      src/views/systemConfig/components/organizManage.vue

+ 2 - 1
build/utils.js

@@ -29,7 +29,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // 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 = ['index','inward','SporadicManage']
+let devModules = ['index','RMS']
 // let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
 

+ 74 - 17
src/views/RMS/components/addCapacity.vue

@@ -2,13 +2,14 @@
   <!-- 添加运力信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">运力信息</el-divider>
+
      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
       <div class="inputBox">
     <span class="text">所属单位类型</span>
       <el-autocomplete
+        class="input"
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
@@ -16,7 +17,7 @@
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
-      </div>
+    </div>
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -33,7 +34,7 @@ export default {
     return {
       form1: {},
       // value: undefined,
-     carrierIds:"",
+      carrierIds: "",
       state: "",
       restaurants: [],
     };
@@ -97,25 +98,81 @@ export default {
          RmsCapacity.carrierIds==null
        )this.$message.error("存在空值!");
        else
-      this.axios
-        .post(
-          "/api/v1/rms/insertCapacity", RmsCapacity
-        )
+        this.axios
+        .post("/api/v1/rms/getCarrierName?state=" + this.state)
         .then((res) => {
-          console.log("res.data.code",res.data.code);
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
+          if (res.data.code == "200") {
+            res.data.data.forEach((element) => {
+              this.restaurants.push({
+                value: element.carrierName,
+                carrierIds: element.carrierId,
+              });
             });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复!");
           }
-          // this.$refs['table'].resetField();
         });
     },
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    handleSelect(item) {
+      this.carrierIds = item.carrierIds;
+      console.log(item);
+    },
+
+    makeSure() {
+      console.log(this.from1);
+      let RmsCapacity = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        // carrierId:this.form1.carrierId,
+        state: this.state,
+        carrierName: this.state,
+        carrierIds: this.carrierIds,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null ||
+        RmsCapacity.carrierIds == null
+      )
+        this.$message.error("存在空值!");
+      else
+        this.axios
+          .post("/api/v1/rms/insertCapacity", RmsCapacity)
+          .then((res) => {
+            console.log("res.data.code", res.data.code);
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败,可能存在重复!");
+            }
+            // this.$refs['table'].resetField();
+          });
+    },
     // 取消
     cancel() {
       this.$router.go(-1);

+ 33 - 17
src/views/RMS/components/addCarDriver.vue

@@ -19,13 +19,13 @@
       </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="handleAvatarSuccess1"
-  :file-list="fileList"
-  list-type="picture">
+    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>
@@ -79,6 +79,7 @@
     </div>
 
     <div class="button_box">
+>>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -107,7 +108,9 @@ export default {
       imageUrls:[],
     };
   },
-  mounted() {},
+  mounted() {
+     this.form1.driverSex = this.sex;	
+},
   methods: {
     onInput() {
       this.axios.post(
@@ -172,12 +175,21 @@ export default {
        this.imageUrl4=URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      },
-  
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}?`);
+    },
     makeSure() {
       console.log(this.form1);
       let reg = new RegExp(/^[0-9]*$/);
@@ -188,7 +200,11 @@ export default {
         driverIdentityCard: this.form1.driverIdentityCard,
         driverPhone: this.form1.driverPhone,
         transportTypeId: this.form1.transportTypeId,
+   //     carrierId: this.form1.carrierId,
         driverPermitNo: this.form1.driverPermitNo,
+        driverLicence: this.form1.driverLicence,
+        driverLicence: this.form1.driverLicence,
+        driverLicence: this.form1.driverLicence,
         state:this.state,
         carrierName:this.state,
         carrierIds: this.carrierIds,
@@ -207,7 +223,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-    
+     //   RmsCarDriver.carrierId==null 
     )this.$message.error("存在空值!");
      else
       this.axios
@@ -223,7 +239,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复!");
           }
-          //this.$refs['table'].resetField();
+          this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -262,7 +278,7 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 1rem;
+  margin-top: 0.1000rem;
   margin-bottom: 0.25rem;
  // margin-left: -18rem;
 }

+ 211 - 203
src/views/RMS/components/addCarrier.vue

@@ -2,83 +2,93 @@
   <!-- 添加承运商信息 -->
   <div class="addWagonLoad">
     <PageTitle @click="onClick">返回</PageTitle>
-    <el-divider content-position="left">承运商信息</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="330" v-model="form1"></dil-form>
-      </div>
+    <div class="user_code">
+      <span class="text">账号:</span>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+    </div>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="330" v-model="form1"></dil-form>
+    </div>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
       :before-upload="beforeUpload2"
-      list-type="picture">
+      list-type="picture"
+    >
       <el-button size="small" type="primary">点击上传运输证</el-button>
-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件,且不超过500kb
+      </div>
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess2"
       :file-list="fileList"
       :before-upload="beforeUpload2"
-      list-type="picture">
+      list-type="picture"
+    >
       <el-button size="small" type="primary">点击上传经营许可证</el-button>
-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件,且不超过500kb
+      </div>
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess3"
       :file-list="fileList"
       :before-upload="beforeUpload2"
-      list-type="picture">
+      list-type="picture"
+    >
       <el-button size="small" type="primary">点击上传营业执照</el-button>
-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件,且不超过500kb
+      </div>
     </el-upload>
-
-
     <div class="form-box f1">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
-    <el-form-item>
-    <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
-  </el-form-item>
-    </el-form>
+        <el-form-item>
+          <el-button type="primary" @click="drawer = true"
+            >添加中标区域信息</el-button
+          >
+        </el-form-item>
+      </el-form>
     </div>
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
-      :before-close="handleClose">
-        <el-input
-            placeholder="请输入内容"
-            v-model="inputText"
-            clearable>
-          </el-input>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>查询
-          </el-button>
-          <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
-              
-</el-drawer>
-      <dilTable v-bind.sync="option1">
+      :before-close="handleClose"
+    >
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div>
+        <dilTable
+          v-bind.sync="options"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <dilTable v-bind.sync="option1">
       <el-table-column fixed="right" label="操作" align="center" width="200">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            @click="deleteclick(scope)"
+          <el-button type="text" size="mini" @click="deleteclick(scope)"
             >删除</el-button
           >
         </template>
       </el-table-column>
     </dilTable>
-
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -95,44 +105,44 @@ export default {
       form1: {},
       value: undefined,
       drawer: false,
-      carrierType:{},
-      carrierTransportType:{},
-      options:{
+      carrierType: {},
+      carrierTransportType: {},
+      options: {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
         selectionType: "radio",
-         mapList:[],
-         registerDate:"",
-         mapValue:""
+        mapList: [],
+        registerDate: "",
+        mapValue: "",
       },
-      imageUrl1:"",
-      imageUrl2:"",
-      imageUrl3:"",
-      imageUrls:[],
+      imageUrl1: "",
+      imageUrl2: "",
+      imageUrl3: "",
+      imageUrls: [],
     };
   },
   methods: {
-    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
+    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);
+    handleAvatarSuccess1(res, file) {
+      this.imageUrl1 = URL.createObjectURL(file.raw);
       // this.axios
       // .then((res) => {
       //   if (res.data.code == 200) {
@@ -140,175 +150,173 @@ export default {
       //     type: "success",
       //     message: "新增成功!",
       //     });
-      //   } 
+      //   }
       //   else {
       //     this.$message.error("图片上传失败,图片格式不得超过500kb且只能是jpg/png文件!");
       //   }
       // });
     },
-    handleAvatarSuccess2(res,file){
-      this.imageUrl2=URL.createObjectURL(file.raw);
+    handleAvatarSuccess2(res, file) {
+      this.imageUrl2 = URL.createObjectURL(file.raw);
     },
-    handleAvatarSuccess3(res,file){
-      this.imageUrl3=URL.createObjectURL(file.raw);
+    handleAvatarSuccess3(res, file) {
+      this.imageUrl3 = URL.createObjectURL(file.raw);
     },
-    handleRemove(file,fileList){
-      console.log(file,fileList)
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
     },
     handlePreview(file) {
-      console.log("*********"+file);
+      console.log("*********" + file);
     },
-    
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" + this.inputText;
     },
-    currentRadioChange(selection){
-      this.mapList=selection, 
-      this.bidArea=this.mapList.bidArea
-     
+    currentRadioChange(selection) {
+      (this.mapList = selection), (this.bidArea = this.mapList.bidArea);
     },
-     makeSure() {
-      let reg=new RegExp(/^[0-9]*$/);
-      let RmsCarrier={
-        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
+    makeSure() {
+      let reg = new RegExp(/^[0-9]*$/);
+      let RmsCarrier = {
+        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={
+      let registerDate = {
         registerDate: this.form1.registerDate,
       };
-      let imageUrls={
-        imageUrl1:this.imageUrl1,
-        imageUrl1:this.imageUrl2,
-        imageUrl1:this.imageUrl3
+      let imageUrls = {
+        imageUrl1: this.imageUrl1,
+        imageUrl1: this.imageUrl2,
+        imageUrl1: this.imageUrl3,
       };
-      console.log(imageUrls)
-      let mapValue={
-        RmsCarrier:RmsCarrier,
-        registerDate:registerDate,
-        imageUrls:imageUrls
+      console.log(imageUrls);
+      let mapValue = {
+        RmsCarrier: RmsCarrier,
+        registerDate: registerDate,
+        imageUrls: imageUrls,
       };
-      if(
-        reg.test(RmsCarrier.carrierContactNumber)==false
-      )this.$message.error("输入的格式不正确");
-       else if(
-          RmsCarrier.carrierName ==null ||
+      if (reg.test(RmsCarrier.carrierContactNumber) == false)
+        this.$message.error("输入的格式不正确");
+      else if (
+        RmsCarrier.carrierName == null ||
+        // imageUrls.imageUrl1 ==null ||
+        // imageUrls.imageUrl2 ==null ||
+        // imageUrls.imageUrl3 ==null ||
 
-          // imageUrls.imageUrl1 ==null ||
-          // imageUrls.imageUrl2 ==null ||
-          // imageUrls.imageUrl3 ==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("存在空值!");
-        else
-         this.axios
-          .post(
-            "/api/v1/rms/insertCarrier",
-            mapValue
-          )
-          .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);
-      },
+        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("存在空值!");
+      else
+        this.axios.post("/api/v1/rms/insertCarrier", mapValue).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{
+.user_code {
+  display: flex;
+  justify-content: center;
+  .text{
     display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
-    }
+    align-items: center;
+  }
+  .input{
+    width: 250px;
   }
-  .form-box {
-    width: 100%;
-    margin-top: 30px;
+}
+.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{
+
+    .el-form-item__label {
       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;
+      align-items: center;
+    }
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
+          width: 250px;
+        }
       }
     }
   }
-.upload-demo{
-  display: flex;
-  justify-content: center;
-  padding-bottom: 1.0rem;
-  .el-upload__tip{
+}
+.upload-demo {
   display: flex;
   justify-content: center;
+  padding-bottom: 1rem;
+  .el-upload__tip {
+    display: flex;
+    justify-content: center;
   }
-  .el-button el-button--primary el-button--small{
-  display: flex;
-  justify-content: center;
-  word-wrap:break-word;
+  .el-button el-button--primary el-button--small {
+    display: flex;
+    justify-content: center;
+    word-wrap: break-word;
   }
 }
-
 </style>

+ 0 - 1
src/views/RMS/components/addConsignee.vue

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

+ 0 - 1
src/views/RMS/components/addGatepost.vue

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

+ 0 - 1
src/views/RMS/components/addMaterial.vue

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

+ 0 - 1
src/views/RMS/components/addNotice.vue

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

+ 0 - 1
src/views/RMS/components/addOilPrice.vue

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

+ 8 - 2
src/views/RMS/components/addPersonnel.vue

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

+ 0 - 1
src/views/RMS/components/addRawWarehouse.vue

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

+ 0 - 1
src/views/RMS/components/addRmsShipper.vue

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

+ 1 - 2
src/views/RMS/components/addSupplier.vue

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

+ 0 - 1
src/views/RMS/components/addTruckCalculate.vue

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

+ 2 - 4
src/views/RMS/components/editCapacity.vue

@@ -4,17 +4,15 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">运力信息</span>
     </div>
     <div class="contractTitle">
       <div class="form_box" style="margin-right: 10rem">
           <dil-form :formId="310" v-model="form1"></dil-form>
       </div>
     </div>
-
-    <div class="button_box">
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </div>

+ 2 - 4
src/views/RMS/components/editCarDriver.vue

@@ -3,17 +3,15 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">司机信息</span>
     </div>
     <div class="contractTitle">
       <div class="form_box">
           <dil-form :formId="340" v-model="form1"></dil-form>
       </div>
     </div>
-
-    <div class="button_box">
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>

+ 1 - 2
src/views/RMS/components/editCarrier.vue

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

+ 1 - 2
src/views/RMS/components/editConsignee.vue

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

+ 1 - 2
src/views/RMS/components/editMaterial.vue

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

+ 1 - 2
src/views/RMS/components/editNotice.vue

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

+ 1 - 2
src/views/RMS/components/editOilPrice.vue

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

+ 1 - 2
src/views/RMS/components/editPersonnel.vue

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

+ 1 - 2
src/views/RMS/components/editRawWarehouse.vue

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

+ 0 - 1
src/views/RMS/components/editRmsShipper.vue

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

+ 1 - 2
src/views/RMS/components/editSupplier.vue

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

+ 2 - 3
src/views/RMS/components/editTruckCalculate.vue

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

+ 3 - 3
src/views/RMS/components/getNoticeById.vue

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

+ 5 - 7
src/views/RMS/components/transitRoute.vue

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

+ 10 - 1
src/views/RMS/components/transitRouteAdd.vue

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

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

+ 140 - 62
src/views/systemConfig/components/organizManage.vue

@@ -1156,16 +1156,50 @@ 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") {
-                      this.$message.success("保存成功");
+                      let pId = null;
+                      if (res.data.pId) {
+                        pId = res.data.pId;
+                      }
+                      let map = {
+                        orgId: res.data.orgId,
+                        depType: res.data.depType,
+                        orgName: res.data.orgName,
+                        pId: pId,
+                      };
+                      //调用物流系统的资源管理模块的接口,修改组织机构。
+                      this.axios
+                        .post("/api/v1/rms/updateShipperResult", map)
+                        .then((res) => {
+                          console.log(res, "物流修改成功");
+                          if (res.data.code == "200") {
+                            this.$message.success("保存成功");
+                          } else {
+                            this.store
+                              .dispatch(
+                                "system/organizManage/delOrg",
+                                map.orgId
+                              )
+                              .then((res) => {
+                                if (res.code === "0") {
+                                  this.$message.success("保存失败");
+                                  this.$router.go(0);
+                                }
+                              });
+                          }
+                        })
+                        .catch((err) => {
+                          this.store
+                            .dispatch("system/organizManage/delOrg", map.orgId)
+                            .then((res) => {
+                              if (res.code === "0") {
+                                this.$message.success("保存失败");
+                                this.$router.go(0);
+                              }
+                            });
+                        });
                       // //  更新菜单项
                       let tempItem = null;
                       dgTree(this.orgTree, "children", (item) => {
@@ -1207,11 +1241,6 @@ 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;
                 //
@@ -1222,7 +1251,45 @@ export default {
                   ) {
                     this.addOrgDutys(res.data.orgId, this.formItem.dutys);
                   }
-                  this.$message.success("添加成功");
+                  console.log(res, "sso添加成功");
+                  let pId = null;
+                  if (res.data.pId) {
+                    pId = res.data.pId;
+                  }
+                  let map = {
+                    orgId: res.data.orgId,
+                    depType: res.data.depType,
+                    orgName: res.data.orgName,
+                    pId: pId,
+                  };
+                  //调用物流系统的资源管理模块的接口,新增组织机构。
+                  this.axios
+                    .post("/api/v1/rms/addShipperResult", map)
+                    .then((res) => {
+                      console.log(res, "物流添加成功");
+                      if (res.data.code == "200") {
+                        this.$message.success("添加成功");
+                      } else {
+                        this.store
+                          .dispatch("system/organizManage/delOrg", map.orgId)
+                          .then((res) => {
+                            if (res.code === "0") {
+                              this.$message.success("新增失败");
+                              this.$router.go(0);
+                            }
+                          });
+                      }
+                    })
+                    .catch((err) => {
+                      this.store
+                        .dispatch("system/organizManage/delOrg", map.orgId)
+                        .then((res) => {
+                          if (res.code === "0") {
+                            this.$message.success("新增失败");
+                            this.$router.go(0);
+                          }
+                        });
+                    });
                   //  更新树
                   this.$refs["orgTree"].append(res.data, this.formItem.pId);
                   this.$refs["orgTree"].setCurrentKey(res.data.id);
@@ -1301,50 +1368,62 @@ export default {
      * 删除树节点元素
      */
     delTreeNode(node, data) {
-      if (
-        (data.children && data.children.length > 0) ||
-        (node.childNodes && node.childNodes.length > 0)
-      ) {
-        this.$message.error("此节点有子节点,不允许删除");
-        return false;
-      }
-      //
-      this.$confirm("确定要删除已选择的记录吗?", "提示", {
-        customClass: "org-Manage-changeprimaryforbutton",
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.store
-            .dispatch("system/organizManage/delOrg", data.orgId)
-            .then((res) => {
-              if (res.code === "0") {
-                this.$message.success("删除成功");
-                //  更新树
-                this.handleReset("formItem");
-                this.$refs["orgTree"].remove(node);
-              } else {
-                this.$message.error(res.message);
-              }
-            });
+      if (data.orgId !== "924126339513061376" &&  data.orgId !== "924126716337721344") {
+        if (
+          (data.children && data.children.length > 0) ||
+          (node.childNodes && node.childNodes.length > 0)
+        ) {
+          this.$message.error("此节点有子节点,不允许删除");
+          return false;
+        }
+        //
+        this.$confirm("确定要删除已选择的记录吗?", "提示", {
+          customClass: "org-Manage-changeprimaryforbutton",
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.$message.info("已取消操作");
-        });
+          .then(() => {
+            this.store
+              .dispatch("system/organizManage/delOrg", data.orgId)
+              .then((res) => {
+                if (res.code === "0") {
+                  this.axios
+                    .post("/api/v1/rms/deleteShipperResult", {
+                      orgId: data.orgId,
+                    })
+                    .then((res) => {
+                      console.log(res);
+                      this.$message.success("删除成功");
+                    });
+                  //  更新树
+                  this.handleReset("formItem");
+                  console.log(node, node);
+                  this.$refs["orgTree"].remove(node);
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
+          })
+          .catch(() => {
+            this.$message.info("已取消操作");
+          });
 
-      this.$nextTick(() => {
-        document
-          .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
-          .getElementsByClassName("el-message-box__btns")[0]
-          .getElementsByTagName("button")[0]
-          .classList.add("el-button--primary");
-        document
-          .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
-          .getElementsByClassName("el-message-box__btns")[0]
-          .getElementsByTagName("button")[1]
-          .classList.remove("el-button--primary");
-      });
+        this.$nextTick(() => {
+          document
+            .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
+            .getElementsByClassName("el-message-box__btns")[0]
+            .getElementsByTagName("button")[0]
+            .classList.add("el-button--primary");
+          document
+            .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
+            .getElementsByClassName("el-message-box__btns")[0]
+            .getElementsByTagName("button")[1]
+            .classList.remove("el-button--primary");
+        });
+      }else{
+        this.$message.error("此组织为基础数据不能进行删除");
+      }
     },
     // 树形控件过滤数据
     filterOrgTree(value, data) {
@@ -1354,17 +1433,15 @@ export default {
     setCheckedKeys() {
       this.defaultExpand = false;
       for (var i = 0; i < this.$refs.orgTree.store._getAllNodes().length; i++) {
-        this.$refs.orgTree.store._getAllNodes()[
-          i
-        ].expanded = this.defaultExpand;
+        this.$refs.orgTree.store._getAllNodes()[i].expanded =
+          this.defaultExpand;
       }
     },
     setCheckedNodes() {
       this.defaultExpand = true; // 展开所有节点
       for (var i = 0; i < this.$refs.orgTree.store._getAllNodes().length; i++) {
-        this.$refs.orgTree.store._getAllNodes()[
-          i
-        ].expanded = this.defaultExpand;
+        this.$refs.orgTree.store._getAllNodes()[i].expanded =
+          this.defaultExpand;
       }
     },
     orgShowHidden() {
@@ -1617,7 +1694,8 @@ export default {
 .rightMenuPr,
 .leftMenuPr,
 .addMenuPr,
-.unlockMenuPr, .lockMenuPr {
+.unlockMenuPr,
+.lockMenuPr {
   display: none;
 }
 .el-tree-node__content:hover {