新增——物流系统新增托运人管理

build/utils.js

@@ -11,12 +11,13 @@ const pathSrc = path.resolve(__dirname, '../src'); // F:\webui\multiple-pages\de
 const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应用下
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
-// index模块（登录）为必须，all 为所有
-//   index    销售    采购   
-// ['index', 'sale', 'TMS', 'standard',]
+// 登录模块为必须，all 为所有
+//   登录      销售    采购  组织机构/系统管理  合同管理    内转     排队  资源管理  仓储管理      统计报表          其他物资物流管理
+// ['index', 'sale', 'TMS', 'systemConfig',   'appoint','inward','queue','RMS'   ,'WMS' , 'statisticalReport','SporadicManage']
 //加载全部
 //let devModules = ['all'];
-let devModules = ['index','F','RMS'];
+//加载制定的模块
+let devModules = ['index','systemConfig','RMS'];
 
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

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

src/views/RMS/components/addCarrier.vue

@@ -2,10 +2,13 @@
   <!-- 添加承运商信息 -->
   <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>账号：</span>
+        <el-input></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"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
@@ -14,9 +17,12 @@
       :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"
@@ -26,9 +32,12 @@
       :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"
@@ -38,47 +47,48 @@
       :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,130 +150,123 @@ 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 ||
-
-          // imageUrls.imageUrl1 ==null ||
-          // imageUrls.imageUrl2 ==null ||
-          // imageUrls.imageUrl3 ==null ||
+      if (reg.test(RmsCarrier.carrierContactNumber) == false)
+        this.$message.error("输入的格式不正确");
+      else if (
+        RmsCarrier.carrierName == 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{
+.button-box {
   display: flex;
   text-align: center;
   align-items: center;
@@ -271,40 +274,39 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
-.form-box{
+.form-box {
   display: flex;
   justify-content: center;
-  .el-form-item{
+  .el-form-item {
     display: flex;
     width: 350px;
     justify-content: center;
-    
-    .el-form-item__label{
+
+    .el-form-item__label {
       display: flex;
       align-items: center;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
+    .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>

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 {