货代首页 2024-2-21

src/components/part-library/main.vue

@@ -75,6 +75,20 @@ export default {
   },
   props: {},
   filters: {},
+    watch:{
+        // 监听
+        visible:{
+            // 执行方法
+            handler(oldValue,newValue) {
+                console.log(oldValue,145)
+                // if (!oldValue) {
+                //     this.search = {}
+                // }
+            },
+            deep: false, // 深度监听
+            immediate: false  // 第一次改变就执行
+        },
+    },
   created() {
     if (localStorage.getItem("roleName") == "贸易") {
       this.findObject(this.tableOption.column, "taxRate").hide = true;
@@ -213,8 +227,6 @@ export default {
       this.$refs.crud.toggleSelection();
     }
   },
-  watch: {
-  }
 };
 </script>
 

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -465,6 +465,7 @@ export default {
         },
         pickGoods() {
             // this.dialogVisible = !this.dialogVisible;
+            this.$refs.library.search = {}
             this.$refs.library.init(false);
         },
         nodeClick(data) {

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -482,6 +482,7 @@ export default {
     },
     pickGoods() {
       // this.dialogVisible = !this.dialogVisible;
+        this.$refs.library.search = {}
       this.$refs.library.init(false);
     },
     nodeClick(data) {
@@ -566,6 +567,7 @@ export default {
       this.$refs.crud.refreshTable();
     },
     openpart(val, list) {
+      // this.$refs.partLibrary.search = {}
       this.$refs.partLibrary.init(val, list)
     },
     addRow() {

src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -1739,6 +1739,24 @@
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
                             if (value == 'PS') {
+                                // 判断是否是分单
+                                if (this.assemblyForm.billType == 'MH') {
+                                    this.$confirm('分单不能添加PS', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
                                 if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {

src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -1745,6 +1745,24 @@
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
                             if (value == 'PS') {
+                                // 判断是否是分单
+                                if (this.assemblyForm.billType == 'MH') {
+                                    this.$confirm('分单不能添加PS', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
                                 if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -640,17 +640,36 @@ import {number} from "echarts";
           type: "warning"
         })
           .then(() => {
-            return precontainersRemove(this.ids);
+            this.precontainersRemovefun()
           })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$emit('billsDetailfun')
-            this.$refs.crud.toggleSelection();
-          });
       },
+          // 删除接口
+          precontainersRemovefun(){
+              let multiList = this.selectionList
+              let arr = this.assemblyForm.preContainersList
+              // 获取有id 的数据
+              const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+              let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+              // 把选中的删除掉
+              multiList.forEach((item)=>{
+                  for (let index in arr) {
+                      if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                          arr.splice(Number(index),1)
+                      }
+                  }
+              })
+              // 有id 的处理
+              if(itemsWithId.length != 0) {
+                  precontainersRemove(arrIds.join(',')).then(() => {
+                      this.$message({
+                          type: "success",
+                          message: "操作成功!"
+                      });
+                      // this.$emit('billsDetailfun')
+                      this.$refs.crud.toggleSelection();
+                  })
+              };
+          },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           precontainersDetail(this.form.id).then(res => {

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1769,6 +1769,24 @@
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
                             if (value == 'PS') {
+                                // 判断是否是分单
+                                if (this.assemblyForm.billType == 'MH') {
+                                    this.$confirm('分单不能添加PS', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
                                 if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -654,16 +654,36 @@ import {
           type: "warning"
         })
           .then(() => {
-            return precontainersRemove(this.ids);
+            this.precontainersRemovefun()
           })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$emit('billsDetailfun')
-            this.$refs.crud.toggleSelection();
-          });
+
+      },
+      // 删除接口
+      precontainersRemovefun(){
+          let multiList = this.selectionList
+          let arr = this.assemblyForm.preContainersList
+          // 获取有id 的数据
+          const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+          let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+          // 把选中的删除掉
+          multiList.forEach((item)=>{
+              for (let index in arr) {
+                  if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index),1)
+                  }
+              }
+          })
+          // 有id 的处理
+          if(itemsWithId.length != 0) {
+              precontainersRemove(arrIds.join(',')).then(() => {
+                  this.$message({
+                      type: "success",
+                      message: "操作成功!"
+                  });
+                  // this.$emit('billsDetailfun')
+                  this.$refs.crud.toggleSelection();
+              })
+          };
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1780,6 +1780,24 @@
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
                             if (value == 'PS') {
+                                // 判断是否是分单
+                                if (this.assemblyForm.billType == 'MH') {
+                                    this.$confirm('分单不能添加PS', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
                                 if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {

src/views/system/dept.vue

@@ -239,6 +239,7 @@
                   prop: "bankAddress",
                   overHidden:true,
               },
+
               {
                   label: "人民币账号",
                   prop: "rmbAccount",

src/views/wel/components/losAssembly/losaudit.vue

@@ -2,127 +2,156 @@
   <div class="home-container">
     <el-card class="home-container__card" >
       <div class="title">
-        <span>
-          审核数据
-        </span>
-        <span>
-          <i
-            class="el-icon-refresh-right"
-            style="cursor: pointer;font-size:20px"
-            @click="refresh"
-          ></i>
+        <span>待审核数据</span>
+          <span class="right">
+          <div class="right_but">
+            <div
+                class="right_but_left"
+                :class="{ right_but_active: isActive == 1 }"
+                @click="inDay"
+            >
+              本日
+            </div>
+            <div
+                class="right_but_right"
+                :class="{ right_but_active: isActive == 2 }"
+                @click="inMoon"
+            >
+              本月
+            </div>
+          </div>
+          <el-date-picker
+              v-model="realDate"
+              type="daterange"
+              size="mini"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              style="margin-right:10px;width:240px"
+              :clearable="false"
+          >
+          </el-date-picker>
+          <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              style="margin-right:10px;"
+              @click="search"
+              circle
+          ></el-button>
+          <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
         </span>
       </div>
       <div class="content" v-loading="loading">
-        <div class="content-item">
-            <div class="card" >
+        <div class="content-item" v-show="menuAll.includes('1716630436370812929') || menuAll.includes('1735108169878765570')" >
+            <div class="card" v-show="menuAll.includes('1716630436370812929')" >
                 <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                 <div class="card-content">
-                    <span class="card-content-num">{{ form.HYCK }}</span>
                     <span class="card-content-text">海运出口</span>
+                    <span class="card-content-num">{{ form.HYCK }}</span>
                 </div>
             </div>
-            <div class="card" >
+            <div class="card" v-show="menuAll.includes('1735108169878765570')" >
                 <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                 <div class="card-content">
-                    <span class="card-content-num">{{ form.SEA }}</span>
                     <span class="card-content-text">SEAMEND</span>
+                    <span class="card-content-num">{{ form.SEA }}</span>
                 </div>
             </div>
         </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1747468109108850690') || menuAll.includes('1747811377529073665')" >
+              <div class="card" v-show="menuAll.includes('1747468109108850690')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.HYJK }}</span>
                       <span class="card-content-text">海运进口</span>
+                      <span class="card-content-num">{{ form.HYJK }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1747811377529073665')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.SIA }}</span>
                       <span class="card-content-text">SIAMEND</span>
+                      <span class="card-content-num">{{ form.SIA }}</span>
                   </div>
               </div>
           </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1747861296998625282') || menuAll.includes('1747867221473996801')" >
+              <div class="card" v-show="menuAll.includes('1747861296998625282')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.KYCK }}</span>
                       <span class="card-content-text">空运出口</span>
+                      <span class="card-content-num">{{ form.KYCK }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1747867221473996801')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.AEA }}</span>
                       <span class="card-content-text">AEAMEND</span>
+                      <span class="card-content-num">{{ form.AEA }}</span>
                   </div>
               </div>
           </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1749275140287397890') || menuAll.includes('1747883193052278785')" >
+              <div class="card" v-show="menuAll.includes('1749275140287397890')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.KYJK }}</span>
                       <span class="card-content-text">空运进口</span>
+                      <span class="card-content-num">{{ form.KYJK }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1747883193052278785')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.AIA }}</span>
                       <span class="card-content-text">AIAMEND</span>
+                      <span class="card-content-num">{{ form.AIA }}</span>
                   </div>
               </div>
           </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1752211642130698241') || menuAll.includes('1752212157493219330')" >
+              <div class="card" v-show="menuAll.includes('1752211642130698241')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.BGSE }}</span>
                       <span class="card-content-text">海运出口报关</span>
+                      <span class="card-content-num">{{ form.BGSE }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1752212157493219330')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.BGSI }}</span>
                       <span class="card-content-text">海运进口报关</span>
+                      <span class="card-content-num">{{ form.BGSI }}</span>
                   </div>
               </div>
           </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1752212392634290177') || menuAll.includes('1752212609395920897')" >
+              <div class="card" v-show="menuAll.includes('1752212392634290177')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.BGAE }}</span>
                       <span class="card-content-text">空运出口报关</span>
+                      <span class="card-content-num">{{ form.BGAE }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1752212609395920897')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.BGAI }}</span>
                       <span class="card-content-text">空运进口报关</span>
+                      <span class="card-content-num">{{ form.BGAI }}</span>
                   </div>
               </div>
           </div>
-          <div class="content-item">
-              <div class="card" >
+          <div class="content-item" v-show="menuAll.includes('1725386630748975106') || menuAll.includes('1731517351142129665')" >
+              <div class="card" v-show="menuAll.includes('1725386630748975106')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.FFSQ }}</span>
                       <span class="card-content-text">付费申请</span>
+                      <span class="card-content-num">{{ form.FFSQ }}</span>
                   </div>
               </div>
-              <div class="card" >
+              <div class="card" v-show="menuAll.includes('1731517351142129665')" >
                   <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
                   <div class="card-content">
-                      <span class="card-content-num">{{ form.FPSQ }}</span>
                       <span class="card-content-text">发票申请</span>
+                      <span class="card-content-num">{{ form.FPSQ }}</span>
                   </div>
               </div>
           </div>
@@ -137,32 +166,60 @@ import {
     shipCheckDate,
     financeCheck, approvalData
 } from "@/api/wel";
+import {defaultDate2, defaultDate3} from "@/util/date";
 export default {
   name: "basicContainer",
   props: {
-    sysType: Number
+    sysType: Number,
+    menuAll:{
+      type:Array,
+      default:[]
+    }
   },
   data() {
     return {
       loading: false,
       form:{}, // 获取到的数据
+      isActive: 1,
+      realDate:[],
     };
   },
   created() {
+      this.realDate = defaultDate2();
   },
   mounted() {
     this.init();
   },
   methods: {
     init() {
+        if (this.realDate == null) {
+            return this.$message.error("请选择日期");
+        }
         this.approvalDatafun()
     },
     // 获取数据
     approvalDatafun(){
-        approvalData().then(res=>{
+        approvalData({
+            dateStart:this.realDate[0],
+            dateEnd:this.realDate[1],
+        }).then(res=>{
             this.form = res.data.data
         })
     },
+    inDay() {
+        this.isActive = 1;
+        this.realDate = defaultDate2();
+        this.init();
+    },
+    inMoon() {
+        this.isActive = 2;
+        this.realDate = defaultDate3();
+        this.init();
+    },
+    search() {
+        this.isActive = 3;
+        this.init();
+    },
     // 刷新
     refresh() {
         this.approvalDatafun()
@@ -187,6 +244,34 @@ export default {
   .title {
     display: flex;
     justify-content: space-between;
+    .right {
+          display: flex;
+          align-items: center;
+          &_but {
+              margin-right: 10px;
+              border: 1px solid #409eff;
+              width: 80px;
+              border-radius: 3px;
+              display: flex;
+              &_left {
+                  width: 40px;
+                  text-align: center;
+                  color: #409eff;
+                  border-right: 1px solid #409eff;
+                  cursor: pointer;
+              }
+              &_right {
+                  width: 40px;
+                  text-align: center;
+                  color: #409eff;
+                  cursor: pointer;
+              }
+              &_active {
+                  color: #fff;
+                  background-color: #409eff;
+              }
+          }
+      }
   }
 }
 .content {
@@ -199,9 +284,12 @@ export default {
     margin-top: 0.5vh;
     margin-right: 0.5vw;
     height: 13vh;
-    width: 15vw;
+    width: 12vw;
     //display: flex;
     //align-items: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
     padding: 0 1.5vw;
     .card {
       display: flex;
@@ -222,7 +310,8 @@ export default {
         }
         &-text {
           color: #909399;
-            margin-left: 10px;
+          margin-right: 10px;
+          width: 85px;
         }
       }
     }

src/views/wel/components/losAssembly/losleftform.vue

@@ -3,7 +3,7 @@
     <div class="home-container" >
         <el-card class="home-container__card">
             <div class="title">
-                <span>单据数统计</span>
+                <span></span>
                 <div class="right">
                     <div class="right_but">
                         <div
@@ -23,9 +23,19 @@
                         size="mini"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
+                        value-format="yyyy-MM-dd"
                         style="margin-right:10px;width:240px"
+                        :clearable="false"
                     >
                     </el-date-picker>
+                    <el-button
+                        type="primary"
+                        size="mini"
+                        icon="el-icon-search"
+                        style="margin-right:10px;"
+                        @click="search"
+                        circle
+                    ></el-button>
                     <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
                 </div>
             </div>
@@ -34,19 +44,19 @@
                     <div id="ringData" ref="ringData" style="width:20vw;height:33vh"/>
                     <div>
                         <div class="content_item">
-                            <div class="content_item_num">{{ data.grossAmount }}</div>
-                            <div class="content_item_text">订单总金额</div>
+                            <div class="content_item_num">{{ data.sum }}</div>
+                            <div class="content_item_text">订单总数量</div>
                         </div>
                         <div class="content_item">
-                            <div class="content_item_num">{{ data.reachAmount }}</div>
-                            <div class="content_item_text">达成</div>
+                            <div class="content_item_num">{{ data.refurbishment }}</div>
+                            <div class="content_item_text">退舱数量</div>
                         </div>
                         <div class="content_item">
                             <div class="divider"/>
                         </div>
                         <div class="content_item">
-                            <div class="content_item_num">{{ data.notReachAmount }}</div>
-                            <div class="content_item_text">未达成</div>
+                            <div class="content_item_num">{{ data.complete }}</div>
+                            <div class="content_item_text">完成数量</div>
                         </div>
                     </div>
                 </div>
@@ -59,7 +69,7 @@
 <script>
 import {monthSales, documentQuantityStatistics, completionRate} from "@/api/wel";
 import search from "@/page/index/search.vue";
-import {dateFormat} from "@/util/date";
+import {dateFormat, defaultDate2,defaultDate3} from "@/util/date";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 export default {
   name: "basicContainer",
@@ -79,31 +89,30 @@ export default {
     };
   },
   created() {
+      this.realDate = defaultDate2();
   },
   mounted() {
     this.init();
   },
   methods: {
     init() {
-      this.completionRatefun()
+        if (this.realDate == null) {
+            return this.$message.error("请选择日期");
+        }
+        this.completionRatefun()
     },
     // 获取数据
     completionRatefun(){
+        this.loading = true
         completionRate({
-
+            dateStart:this.realDate[0],
+            dateEnd:this.realDate[1]
         }).then(res=>{
             console.log(res.data.data,92)
-        })
-    },
-    getmonthSales() {
-      this.loading = true;
-      monthSales({ tradeType: this.tradeType, billType: "BJ" })
-        .then(res => {
-          this.data = res.data.data;
-        })
-        .finally(() => {
-          this.loading = false;
-          this.ringData();
+            this.data = res.data.data
+        }).finally(() => {
+            this.loading = false;
+            this.ringData();
         });
     },
     refresh() {
@@ -121,6 +130,11 @@ export default {
         this.realDate = defaultDate3(); // 获取本月第一天和本月最后一天
         this.init();
     },
+    // 搜索
+    search() {
+        this.isActive = 3;
+        this.init();
+    },
     // echarts配置项
     ringData() {
       let ringData = this.$echarts.init(document.getElementById("ringData"));
@@ -138,7 +152,7 @@ export default {
             left: "center",
             top: "43%",
             style: {
-              text: this.data.yieldRate + "%",
+              text: this.data.rate + "%",
               textAlign: "center",
               fill: "#000",
               fontSize: 24
@@ -171,8 +185,8 @@ export default {
               show: false
             },
             data: [
-              { value: Number(this.data.reachAmount), name: "已报价数量" },
-              { value: Number(this.data.notReachAmount), name: "未报价数量" }
+              { value: Number(this.data.refurbishment), name: "退舱数量" },
+              { value: Number(this.data.complete), name: "完成数量" }
             ]
           }
         ]

src/views/wel/components/losAssembly/losrealtime.vue

@@ -28,7 +28,9 @@
             size="mini"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
             style="margin-right:10px;width:240px"
+            :clearable="false"
           >
           </el-date-picker>
           <el-button

src/views/wel/components/losAssembly/losrightform.vue

@@ -2,62 +2,27 @@
     <div class="home-container">
         <el-card class="home-container__card">
             <div class="title">
-                <span>TEU</span>
+                <span>{{businessType == 1?'TEU':'尺码'}}</span>
                 <div class="right">
-                    <search-query :datalist="businessTypeData"
-                                  :selectValue="businessType"
-                                  :clearable="true"
-                                  :buttonIf="false"
-                                  size="mini"
-                                  placeholder="请选择业务类型"
-                                  @corpChange="corpChange($event,'businessType')">
-                    </search-query>
-                    <div class="right_but">
-                        <div
-                            class="right_but_left"
-                            :class="{ right_but_active: isActive == 1 }"
-                            @click="inDay">本日
-                        </div>
-                        <div
-                            class="right_but_right"
-                            :class="{ right_but_active: isActive == 2 }"
-                            @click="inMoon">本月
-                        </div>
+                    <el-radio v-model="businessType" label="1" @input="init" >海运</el-radio>
+                    <el-radio v-model="businessType" label="2" @input="init" >空运</el-radio>
+                    <div class="content-year">
+                        <el-date-picker
+                            v-model="annual"
+                            type="year"
+                            size="mini"
+                            placeholder="选择年"
+                            value-format="yyyy"
+                            style="margin-right:10px"
+                            :clearable="false"
+                            @change="init"
+                        />
                     </div>
-                    <el-date-picker
-                        v-model="realDate"
-                        type="daterange"
-                        size="mini"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        style="margin-right:10px;width:240px"
-                    >
-                    </el-date-picker>
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="el-icon-search"
-                        style="margin-right:10px;"
-                        @click="search"
-                        circle
-                    ></el-button>
                     <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
                 </div>
             </div>
 
             <div class="content" v-loading="loading">
-                <!--<div class="content-year">-->
-                <!--    <el-date-picker-->
-                <!--        v-model="annual"-->
-                <!--        type="year"-->
-                <!--        size="mini"-->
-                <!--        placeholder="选择年"-->
-                <!--        value-format="yyyy"-->
-                <!--        style="margin-right:10px"-->
-                <!--        @change="getsalesTrend"-->
-                <!--    />-->
-                <!--</div>-->
-
                 <div id="polylineData" ref="polylineData" style="width:55vw;height:33vh"/></div>
         </el-card>
 
@@ -66,7 +31,7 @@
 </template>
 
 <script>
-import {salesTrend} from "@/api/wel";
+import {indexStatisticsTrend, salesTrend} from "@/api/wel";
 import {defaultDate2, defaultDate3, getYearDate} from "@/util/date";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 
@@ -74,17 +39,14 @@ export default {
     components: {SearchQuery},
     data(){
         return {
-            isActive: 1, // 本日/本月按钮是否选中状态
             loading: false,
-            annual: "",
-            tradeType:'',
-            // 业务类型
-            businessTypeData:[],
+            annual: "", // 时间
+            businessType:'1', // 业务类型
+            moneyList:[], // 获取的数据
         }
     },
     created() {
         this.annual = getYearDate().toString();
-        this.getSysType();
     },
     mounted() {
         this.init();
@@ -94,66 +56,24 @@ export default {
             this.init();
         },
         init() {
-            if (this.tradeType == null) {
-                return
-            }else {
-                this.getsalesTrend();
-            }
-        },
-        // 本日按钮
-        inDay() {
-            this.isActive = 1;
-            this.realDate = defaultDate2(); // 获取当天
-            this.init();
-        },
-        // 本月按钮
-        inMoon() {
-            this.isActive = 2;
-            this.realDate = defaultDate3(); // 获取本月第一天和本月最后一天
-            this.init();
+            this.indexStatisticsTrendfun()
         },
-        // 点击搜索按钮
-        search() {
-            this.isActive = 3;
-            this.init();
-        },
-        getSysType() {
-            const sysType = localStorage.getItem("sysitemType");
-            if (sysType == 6) {
-                this.tradeType = "JXS";
-            } else if (sysType == 5) {
-                this.tradeType = "SW";
-            } else if (sysType == 4) {
-                this.tradeType = "CK";
-            } else if (sysType == 3) {
-                this.tradeType = "JK";
-            } else if (sysType == 2) {
-                this.tradeType = "GN";
-            } else if (sysType == 1) {
-                this.tradeType = "XX";
-            } else if (sysType == 999) {
-                this.tradeType = "ADMIN";
-            }
-        },
-        // 搜索获取数据
-        getsalesTrend() {
-            this.loading = true;
-            this.moneyList = [];
-            salesTrend({
-                tradeType: this.tradeType,
-                billType: "XS",
-                annual: this.annual
-            })
-                .then(res => {
-                    res.data.data.forEach(e => {
-                        this.moneyList.push(Number(e.money));
-                    });
+        // 获取数据
+        indexStatisticsTrendfun(){
+            this.moneyList = []
+            indexStatisticsTrend({
+                date:this.annual,
+                type:this.businessType
+            }).then(res=>{
+                this.moneyList = res.data.data.map(item=>{
+                    return item.money
                 })
-                .finally(() => {
-                    this.loading = false;
-                    this.polylineDatafun();
-                });
+            }).finally(() => {
+                this.loading = false;
+                this.polylineDatafun();
+            });
         },
+
         // echarts 配置项
         polylineDatafun() {
             let polylineData = this.$echarts.init(

src/views/wel/components/losHome.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <losquick class="item1" :menuAll="menuAll" ></losquick>
-        <losaudit class="item2"></losaudit>
+        <losaudit class="item2" :menuAll="menuAll" ></losaudit>
         <losrealtime class="item3"></losrealtime>
         <losleftform class="item4" ></losleftform>
         <losrightform class="item5" ></losrightform>

src/views/wel/index.vue

@@ -49,6 +49,7 @@
               <xindongPower :sysType="billType"></xindongPower>
           </div>
       </dev>
+      <!--货代首页-->
       <div v-if="saberTenantId == 409341">
           <los-home></los-home>
       </div>

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.104:1080',
+        target: 'http://192.168.8.104:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {