tij

build/utils.js

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

src/components/DilCommonUI/packages/table/src/table.js

@@ -67,7 +67,7 @@ export default {
             console.log(" 判断是否需要在请求体中放入参数")
             
             this.dataRequestQuery=this.requestQuery;
-            console.log(this.dataRequestQuery.resultBreakId)
+            // console.log(this.dataRequestQuery.resultBreakId)
           }
 
           let data = undefined;

src/components/DilCommonUI/packages/table/src/table.vue

@@ -226,6 +226,8 @@ export default {
     // 刷新表格数据
     refreshData() {
       this.requestData();
+      //多选表格，清空用户的选择
+      this.$refs.mainTable.clearSelection();
     },
     toggleRowExpansion(row, expanded) {
       this.$refs.mainTable.toggleRowExpansion(row, expanded);

src/views/RMS/components/addCapacity.vue

@@ -136,6 +136,7 @@ export default {
         capacityOwneris: this.form1.capacityOwneris,
         capacityVip: this.form1.capacityVip,
         capacityBlacklist: this.form1.capacityBlacklist,
+        remark:this.form1.remark,
         carrierId:this.carrierIds,
         state: this.state
       };

src/views/RMS/components/addCarrier.vue

@@ -293,6 +293,8 @@ export default {
                     };
                     //传给后端的数据
                     let mapValue = {
+                      //承运商账号
+                      carrierSsoCode: this.input,
                       //表单数据
                       from: this.form1,
                       //图片数据
@@ -303,7 +305,6 @@ export default {
                     this.axios
                       .post("/api/v1/rms/insertCarrier", mapValue)
                       .then((res) => {
-                        console.log(2)
                         if (res.data.code == "200") {
                           this.cancel();
                           this.$message.success("添加成功");

src/views/RMS/components/addPersonnel.vue

@@ -203,49 +203,63 @@ export default {
           ){
               this.$message.error("存在空值！");
       }else{
-
-      //新增用户
-      this.$store.dispatch('system/usersManage/addUser',formData)
+      //判断RMS_PERSONNEL表中是否存在该人员信息，存在提示存在，否则开始赋权新增
+      this.axios.post('/api/v1/rms/isInHere?personnelJobNumber='+this.form1.personnelJobNumber)
       .then((res)=>{
-          console.log("role",res)
-          //再新增RMS_PERSONNEL表信息
-          let rmsPersonnel = {
-            personnelJobNumber : this.form1.personnelJobNumber,
-            personnelPost : this.form1.personnelPost,
-            personnelName : this.form1.personnelName,
-            personnelDepartmentId : this.form1.shipperId,
-            // personnelWorkshopid : this.form1.personnelWorkshopid,
-            personnelShifts : this.form1.personnelShifts,
-            personnelTeam : this.form1.personnelTeam,
-            personnelSsoId : res.data.userId
-          }
-          // console.log("rmsPersonnel",rmsPersonnel)
-              this.axios.post('/api/v1/rms/addPersonnel',rmsPersonnel)
-              .then((res)=>{
-                          // console.log("Personnel",res)
-                    if (res.data.code == 200) {
-                    this.$message({
-                      type: "success",
-                      message: "新增成功!",
-                    });
-                    // this.$refs.table.refreshData();
-                  } else {
-                    this.$message.error("新增失败,可能存在重复！");
-                  }
-                  // this.$refs['table'].resetField();
-              })
+        console.log("res",res);
+        if(res.data==0){
+          this.$message.error("新增失败,该账号已存在！");
+        }else{
+          //开始赋权新增
+          //新增用户表
+          this.$store.dispatch('system/usersManage/addUser',formData)
+          .then((res)=>{
+              //console.log("role",res)
+              //保存权限表中的用户主键Id
+              this.personnelSsoId = res.data.userId;
+              //再新增RMS_PERSONNEL表信息
+              let rmsPersonnel = {
+                personnelJobNumber : this.form1.personnelJobNumber,
+                personnelPost : this.form1.personnelPost,
+                personnelName : this.form1.personnelName,
+                personnelDepartmentId : this.form1.shipperId,
+                // personnelWorkshopid : this.form1.personnelWorkshopid,
+                personnelShifts : this.form1.personnelShifts,
+                personnelTeam : this.form1.personnelTeam,
+                personnelSsoId : this.personnelSsoId
+              }
+              //  console.log("rmsPersonnel",rmsPersonnel)
+                  this.axios.post('/api/v1/rms/addPersonnel',rmsPersonnel)
+                  .then((res)=>{
+                              // console.log("Personnel",res)
+                        if (res.data.code == 200) {
+                        this.$message({
+                          type: "success",
+                          message: "新增成功!",
+                        });
+                        // this.$refs.table.refreshData();
+                        
+                        //最后新增角色赋权表
 
-              //最后新增角色赋权表
+                          this.axios.post('pass/v1/sysuserroles/addUserroles?userId='
+                          +this.personnelSsoId+'&userCode='+this.form1.personnelJobNumber+'&roleId='+this.value3)
+                          .then((res)=>{
+                            // console.log("success")
+                              this.$router.go(-1);
+                          })
 
-              this.axios.post('pass/v1/sysuserroles/addUserroles?userId='
-              +res.data.userId+'&userCode='+this.form1.personnelJobNumber+'&roleId='+this.value3)
-              .then((res)=>{
-                // console.log("success")
-                  this.$router.go(-1);
-              })
+                      } else {
+                        this.$message.error("新增失败,可能存在重复！");
+                      }
+                      // this.$refs['table'].resetField();
+                  })
 
-      });//end
-      }
+          });//end
+
+        }
+      });
+      
+      }//else
       
     },
     // 取消

src/views/RMS/components/carrier.vue

@@ -1,4 +1,4 @@
-//资源管理港口
+//资源管理承运商
 <template>
   <div class="steel_inbound">
     <div class="sache">
@@ -43,7 +43,6 @@ export default {
     onclick() {
       this.options.requestUrl =
         "/api/v1/rms/getCarrierList?apiId=342&con=" + this.inputText;
-      console.log(this.textInput);
     },
     toInsert() {
       this.$router.push("/addCarrier");

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue

@@ -224,11 +224,11 @@
       ><el-button type="primary" class="btn" @click="onclickMaterial">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button @click="toggleSelection">取消</el-button>
+      <!-- <el-button @click="toggleSelection">取消</el-button> -->
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @selection-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
         </dilTable>
       </div>
     </el-drawer>
@@ -353,7 +353,7 @@ export default {
       //物资模态框
       materialOptions:{
           requestUrl:"",
-          selectionType: "select",
+          selectionType: "radio",
       },
       line: {
         requestUrl: "",
@@ -490,17 +490,8 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      this.selectionList1.forEach((e) => {
-        var addmap = {
-          materialCode: e.materialCode,
-          materialName: e.materialName,
-          Specification: e.materialSpecification+e.materialModel,
-          orderMaterialWeight: null,        
-          materialId: e.materialId,
-          materialPriority:1,
-        };
-          this.tableData.push(addmap);
-      });     
+        this.selectionList1.materialPriority = 1
+        this.tableData.push(this.selectionList1);    
         this.selectionList1 = [];
         this.table = false;
         console.log(this.selectionList1)

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue

@@ -98,11 +98,11 @@ export default {
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=15&dispatchStatus=0",
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=15&sporadicStatus=1",
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=11"       
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&type1=1"       
       }else{
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=15&dispatchStatus=0&userId=" + getCookie("userId"),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=15&sporadicStatus=1&userId=" + getCookie("userId"),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=11&userId=" + getCookie("userId")
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&type1=1&userId=" + getCookie("userId")
       }
   },
   methods: {
@@ -110,11 +110,11 @@ export default {
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=15&dispatchStatus=0&test=" + new Date(),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=15&sporadicStatus=1&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=11&test=" + new Date()
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&type1=1&test=" + new Date()
       }else{
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=15&dispatchStatus=0&userId=" + getCookie("userId") + "&test=" + new Date(),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=15&sporadicStatus=1&userId=" + getCookie("userId") + "&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=11&userId=" + getCookie("userId") + "&test=" + new Date()
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&type1=1&userId=" + getCookie("userId") + "&test=" + new Date()
      }
     },
     stopSpoOrder(scope){

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -224,11 +224,11 @@
       ><el-button type="primary" class="btn" @click="onclickMaterial">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button @click="toggleSelection">取消</el-button>
+      <!-- <el-button @click="open">取消</el-button> -->
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @selection-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
         </dilTable>
       </div>
     </el-drawer>
@@ -353,7 +353,7 @@ export default {
       //物资模态框
       materialOptions:{
           requestUrl:"",
-          selectionType: "select",
+          selectionType: "radio",
       },
       line: {
         requestUrl: "",
@@ -491,24 +491,18 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1) 
-      this.selectionList1.forEach((e) => {
-        var addmap = {
-          materialCode: e.materialCode,
-          materialName: e.materialName,
-          Specification: e.materialSpecification+e.materialModel,
-          orderMaterialWeight: null,        
-          materialId: e.materialId,
-          materialPriority:1,
-        };
-          this.tableData.push(addmap);
-      });     
+      console.log(this.selectionList1)
+        this.selectionList1.materialPriority = 1
+        this.tableData.push(this.selectionList1);  
+        console.log(this.tableData)
+        console.log(this.tableData)  
         this.selectionList1 = [];
         this.table = false;
         console.log(this.selectionList1)
     },
     //取消模态框多选
     open() {
+      console.log(this.selectionList1.length)
       if (this.selectionList1.length != 0) {
         this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
           confirmButtonText: "确定",

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -98,11 +98,11 @@ export default {
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0",
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1",
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11"       
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
       }else{
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("userId"),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1&userId=" + getCookie("userId"),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11&userId=" + getCookie("userId")
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("userId")
       }
   },
   methods: {
@@ -110,11 +110,11 @@ export default {
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&test=" + new Date(),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11&test=" + new Date()
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
       }else{
             this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("userId") + "&test=" + new Date(),
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1&userId=" + getCookie("userId") + "&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11&userId=" + getCookie("userId") + "&test=" + new Date()
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("userId") + "&test=" + new Date()
      }
     },
     stopSpoOrder(scope){
@@ -164,7 +164,7 @@ export default {
           }else if(this.activeName == "second"){
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1&con=" + this.input
           }else{
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11&con=" + this.input
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
           }                
         }else
         {
@@ -173,7 +173,7 @@ export default {
           }else if(this.activeName == "second"){
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&sporadicStatus=1&userId=" + getCookie("userId") + "&con=" + this.input
           }else{
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=4&orderStatus=11&userId=" + getCookie("userId") + "&con=" + this.input
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("userId") + "&con=" + this.input
           }       
         }
         }else{

src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -152,11 +152,11 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=1&sporadicStatus=0&carrierSsoId=" + getCookie("userId");
     } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&dispatchStatus=0";
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&sporadicStatus=0&dispatchStatus=1";
     } 
   },
   methods: {
@@ -180,7 +180,7 @@ export default {
     },
     //点击取消按钮的事件
     cancel(){
-      this.$router.push('/mornThanTransportOrder')
+      this.$router.push('/sporadicTransportOrder')
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index){

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -89,27 +89,29 @@ export default {
     };
   },
   created(){
-      this.carrierUserId = getCookie('userId')
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
-      }     
+      }
   },
   methods: {
     getRequestUrl(){
         if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
-      } 
-    },
-    onclick(){
-      console.log("dianji")
+      }
     },
     handleClick(tab, event) {
       this.getRequestUrl()

src/views/WMS/components/steel/steel_restack.vue

@@ -44,7 +44,6 @@
         </el-tabs>
       </template>
     </div>
-  </div>
 </template>
 <script>
 // import { first, values } from "xe-utils";

src/views/appoint/components/saleContract/addSaleOrderSend.vue

@@ -51,7 +51,7 @@
           <template slot="scope" v-if="item.label !== '收货地址'">
             <span>{{ item.label }}</span>
           </template>
-          <template slot="scope" v-if="item.label !== '收货日期'">
+          <template slot="scope" v-if="item.label !== '截止日期'">
             <span>{{ item.label }}</span>
           </template>
           <template slot="scope" v-if="item.label !== '收货姓名'">
@@ -357,7 +357,7 @@ export default {
         },
         {
           prop: "saleDateOfReceipt",
-          label: "发货日期",
+          label: "截止日期",
           width: "230",
           slot: true,
         },
@@ -528,7 +528,7 @@ export default {
     },
     //车辆模态框的确定事件
     AddTruckClick(){
-      console.log(this.selectTruck)
+      console.log("1111111",this.selectTruck)
       this.selectTruck.forEach(e => {
         // console.log(e)
         this.selectionList.push({
@@ -544,6 +544,9 @@ export default {
         })
       });
       this.truckDrawer = false;
+      //置空当前多选选中的车辆数据
+      this.selectTruck = [];
+      console.log("222222",this.selectTruck)
     },
     //车辆模态框框计算
     selectTruckClick(){

src/views/sale/components/transport_order/receiveOrder.vue

@@ -195,19 +195,19 @@ export default {
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
           getCookie("userId") +
           "&con=" +
-          this.input;
+          this.inputText;
       } else if (this.activeName == "second") {
         this.option1.requestUrl =
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId=" +
           getCookie("userId") +
           "&con=" +
-          this.input;
+          this.inputText;
       } else {
         this.option1.requestUrl =
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
           getCookie("userId") +
           "&con=" +
-          this.input;
+          this.inputText;
       }
     },
     // -------查看物资详情 (已接收)
@@ -306,14 +306,31 @@ export default {
     },
     //关闭选中行的订单
     closeOrder(row){
-      this.$message.success('关闭成功');
-      this.axios
-        .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-        .then((res) => {
-          if(res.data.code == '200'){
-            this.$router.go(0);
-          }
-        });   
+      this.$confirm("是否关闭", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "关闭成功!",
+          });
+          this.axios
+            .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
+            .then((res) => {
+              if(res.data.code == '200'){
+                this.$router.go(0);
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消关闭!",
+          });
+        }) 
         
     },
   },

src/views/statisticalReport/app.js

@@ -20,6 +20,10 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -5,9 +5,10 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option"></dilTable>
     </div>
   </div>
 </template>
@@ -21,6 +22,7 @@ export default {
         requestUrl: "",
       },
       input: "",
+      tableTitle:'销售统计报表'
     };
   },
   created(){

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -5,9 +5,10 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option"></dilTable>
     </div>
   </div>
 </template>
@@ -21,16 +22,25 @@ export default {
         requestUrl: "",
       },
       input: "",
+      tableTitle:"零星进厂统计报表"
     };
   },
   created(){
-      if(getCookie('orgCode') == 'chengyunshang'){
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
-      }else{
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
       }
+      else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?apiId=425&orderType=12"
+      }
+      else{
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=' + getCookie("userId")
+      }
+      console.log(this.option)
   },
   methods: {
+    inition(){
+
+    },
     onclick() {
       this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?api=424&con=" + this.input;
     },

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -5,9 +5,10 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option"></dilTable>
     </div>
   </div>
 </template>
@@ -21,13 +22,17 @@ export default {
         requestUrl: "",
       },
       input: "",
+      tableTitle:'零星出厂统计报表'
     };
   }, 
   created(){
-      if(getCookie('orgCode') == 'chengyunshang'){
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
-      }else{
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
+      }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&orderType=13"
+      }
+      else{
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("userId")
       }
   },
   methods: {