adahsdj

build/utils.js

@@ -17,8 +17,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','inward']
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
+// let devModules = ["index", "ADMINISTRATORS", "RMS"];
 let devModules = ["all"];
-// let devModules = ['index','TMS']
 // let devModules = ['index','statisticalReport','inward']
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

config/index.js

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

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -160,6 +160,44 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="删除多余实绩" name="third">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="deleteMoreResult"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -205,6 +243,16 @@ export default {
     this.information();
   },
   methods: {
+    deleteMoreResult() {
+      console.log(this.orderNumber);
+      this.axios
+        .post("/api/v1/bp/deleteErrorResult?orderNumber=" + this.orderNumber)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("删除成功");
+          }
+        });
+    },
     updateLineSqe() {
       let map = {
         orderId: this.orderId,

src/views/RMS/components/capacity.vue

@@ -2,22 +2,25 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="textInput"
-        clearable>
+      <el-input placeholder="请输入内容" v-model="textInput" clearable>
       </el-input>
-      <el-button type="primary" class="btn" @click="onclick" :loading="selectLoading">
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick"
+        :loading="selectLoading"
+      >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <el-button type="primary" class="btn" @click="toInsert">
+      <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
       <el-button type="primary" class="btn" @click="toInsert1">
         <i class="el-icon-plus"></i>新增特殊车牌
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
-
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
     </div>
     <div class="table">
       <dilTable
@@ -29,25 +32,27 @@
       >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-             <el-button
+            <el-button
               type="text"
               size="small"
               @click="updateCapacity(scope.row.capacityCarrierId)"
             >
               修改备注
-            </el-button> 
+            </el-button>
             <el-button
               type="text"
               size="small"
               @click="deleteCapacity(scope.row)"
-              v-if="show==true">
+              v-if="show == true"
+            >
               删除
             </el-button>
-             <el-button
+            <el-button
               type="text"
               size="small"
               @click="showCapacity(scope.row.capacityId)"
-              v-if="show==false">
+              v-if="show == false"
+            >
               查看详情
             </el-button>
           </template>
@@ -59,134 +64,196 @@
 <script>
 import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-     selectLoading:false,
-     isKuang:false,
-     tableloading:false,
-     show:false,
-     name:"homeworkPath",
-     textInput:"",
-     restaurants: [],
-     ssoId:null,
-     options:{
+  data() {
+    return {
+      selectLoading: false,
+      isKuang: false,
+      tableloading: false,
+      show: false,
+      name: "homeworkPath",
+      textInput: "",
+      restaurants: [],
+      ssoId: null,
+      options: {
         // first请求数据的地址
-        requestUrl: "",
-      },
-    }
+        requestUrl: ""
+      }
+    };
   },
-  created(){
-    if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
-        this.show = true
+  created() {
+    if (
+      getCookie("orgCode") == "wuliuchuyunzhongxin" ||
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "chengyunshang"
+    ) {
+      this.show = true;
+    }
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+        getCookie("userId");
+    } else if (getCookie("orgCode") == "baohua") {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null;
     }
-    if(getCookie("orgCode") == "chengyunshang"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId");
-    }else if(getCookie("orgCode") == "baohua"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId");
-     }else{
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null;
-     } 
   },
-  methods:{
-    func(res){
-      if(this.tableloading){
+  methods: {
+    func(res) {
+      if (this.tableloading) {
         this.tableloading = false;
       }
-      if(this.isKuang){
+      if (this.isKuang) {
         this.isKuang = false;
       }
-      if(this.selectLoading){
+      if (this.selectLoading) {
         this.selectLoading = false;
       }
     },
-    onclick(){
+    onclick() {
       this.isKuang = true;
       this.tableloading = true;
       this.selectLoading = true;
-      if(this.textInput){
-        if(getCookie("orgCode") == "chengyunshang"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput + "&i=" + new Date();
-        }else if(getCookie("orgCode") == "baohua"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + this.textInput + "&i=" + new Date();
-        }else{
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null +"&con=" +this.textInput + "&i=" + new Date();
+      if (this.textInput) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date();
+        } else if (getCookie("orgCode") == "baohua") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            this.textInput +
+            "&i=" +
+            new Date();
+        } else {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(getCookie("orgCode") == "chengyunshang"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") + "&i=" + new Date();
-        }else if(getCookie("orgCode") == "baohua"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
-        }else{
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null + "&i=" + new Date();
+      } else {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else if (getCookie("orgCode") == "baohua") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
-     toInsert() {
+    toInsert() {
       this.$router.push("/addCapacity");
     },
     toInsert1() {
       this.$router.push("/addOtherCapacity");
     },
-    updateCapacity(capacityCarrierId){
+    updateCapacity(capacityCarrierId) {
       // console.log("capacityCarrierId" +capacityCarrierId);
       this.$router.push("/editCapacity/" + capacityCarrierId);
     },
-    showCapacity(capacityId){
-      this.$router.push("/showCapacity/" + capacityId)
+    showCapacity(capacityId) {
+      this.$router.push("/showCapacity/" + capacityId);
     },
-    deleteUser(userId){
-      this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
-      });
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then(res => {});
     },
-    
+
     deleteCapacity(row) {
-      console.log("row",row)
+      console.log("row", row);
+      console.log(row);
       let map = {
-        carrierSSOId : getCookie("userId"),
-        capacityId : row.capacityId
-      }
-        if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
-          this.$confirm('是否删除与车牌号('+row.capacityNumber+')的绑定关系?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          this.axios
-          .post("/api/v1/rms/deleteCapacityCarrier",map)
-          .then((res) => {
-            if(res.data.code=='0'){
-              this.$message.success("删除成功!")
-              if(getCookie("orgCode") == "chengyunshang"){
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&i="+new Date();
-              }else if(getCookie("orgCode") == "baohua"){
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-              }else{
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null +"&i="+new Date();
-              } 
-            }
+        capacityCarrierId: row.capacityCarrierId,
+        carrierSSOId: getCookie("userId"),
+        capacityId: row.capacityId
+      };
+      if (
+        getCookie("orgCode") == "wuliuchuyunzhongxin" ||
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "chengyunshang"
+      ) {
+        this.$confirm(
+          "是否删除与车牌号(" + row.capacityNumber + ")的绑定关系?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        )
+          .then(() => {
+            this.axios
+              .post("/api/v1/rms/deleteCapacityCarrier", map)
+              .then(res => {
+                if (res.data.code == "0") {
+                  this.$message.success("删除成功!");
+                  if (getCookie("orgCode") == "chengyunshang") {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      getCookie("userId") +
+                      "&i=" +
+                      new Date();
+                  } else if (getCookie("orgCode") == "baohua") {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      getCookie("userId") +
+                      "&i=" +
+                      new Date();
+                  } else {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      null +
+                      "&i=" +
+                      new Date();
+                  }
+                }
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
           });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-        }else{
-          this.$message.error("权限不足，请联系管理员!")
-        }  
-      },
-    },
+      } else {
+        this.$message.error("权限不足，请联系管理员!");
+      }
+    }
   }
-
+};
 </script>
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>