销售页面修改

build/utils.js

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