Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@FeignClient(
+        contextId = "anrui-reportcenter-AppVehRebate",
+        name = "anrui-reportcenter",
+        path = "v1/carRebate")
+public interface AppVehRebateFeign {
+
+    @ApiOperation("单车返利统计列表")
+    @PostMapping("/list")
+    @ResponseBody
+    ResultBean<VehRebatePageVo> list(@RequestBody PagerQuery<VehRebatePageQuery> pagerQuery);
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ListVehRebate {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("销售日期")
+    private String saleTime;
+    @ApiModelProperty("实销日期")
+    private String realSaleTime;
+    @ApiModelProperty("预提返利")
+    private String rebateEstimate;
+    @ApiModelProperty("上传")
+    private String rebateUpload;
+    @ApiModelProperty("二次上传")
+    private String rebateSecondaryUpload;
+    @ApiModelProperty("待确定")
+    private String rebateStayDetermine;
+    @ApiModelProperty("调整")
+    private String rebateAdjust;
+    @ApiModelProperty("未上传")
+    private String rebateNoUpload;
+    @ApiModelProperty("费用预提")
+    private String feesEstimate;
+    @ApiModelProperty("上传")
+    private String feeUpload;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("采购系统")
+    private String buySystem;
+    @ApiModelProperty("分公司")
+    private String branch;
+    @ApiModelProperty("事业部")
+    private String division;
+    @ApiModelProperty("车辆sid")
+    private String sid;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TotalVehRebate implements Vo {
+    private static final long serialVersionUID = -8631337422991366458L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("合同状态")
+    private String contractType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("承诺汇款日期")
+    private String paymentDate;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @ApiModelProperty("数量")
+    private String number;
+    @ApiModelProperty("原因")
+    private String reason;
+    @ApiModelProperty("创建日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+    @ApiModelProperty("是否显示领票按钮")
+    private Boolean showGetInvoiceBtn;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("销售类型")
+    private String type;
+    @ApiModelProperty("车架号（拼接）")
+    private String vinNo;
+    @ApiModelProperty("是否领取发票原件")
+    private String isLQOrigInvoice;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebatePageQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehRebatePageQuery implements Query {
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("条件")
+    private String names;
+    @ApiModelProperty("销售日期")
+    private String date;
+    @ApiModelProperty("实销日期")
+    private String date2;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebatePageVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VehRebatePageVo {
+
+    @ApiModelProperty("合计")
+    private TotalVehRebate total;
+    @ApiModelProperty("列表")
+    private List<ListVehRebate> list;
+    @ApiModelProperty("总页数")
+    private Integer pages;
+}

anrui-reportcenter/anrui-reportcenter-biz/pom.xml

@@ -116,6 +116,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui.scm</groupId>
+            <artifactId>anrui-scm-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.reportcenter"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.base"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.*"})
 public class ReportcenterApplication {
 
     public static void main(String[] args) {

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.vehRebate;
+
+import com.yxt.anrui.reportcenter.api.vehRebate.AppVehRebateFeign;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController()
+@RequestMapping("v1/carRebate")
+public class AppVehRebateRest implements AppVehRebateFeign {
+
+    @Autowired
+    private AppVehRebateService appVehRebateService;
+
+    @Override
+    public ResultBean<VehRebatePageVo> list(PagerQuery<VehRebatePageQuery> query) {
+        return appVehRebateService.list(query);
+    }
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java

@@ -0,0 +1,117 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.vehRebate;
+
+import com.yxt.anrui.reportcenter.api.vehRebate.ListVehRebate;
+import com.yxt.anrui.reportcenter.api.vehRebate.TotalVehRebate;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatQuery;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AppVehRebateService {
+
+    @Autowired
+    private ScmVehRebateFeign scmVehRebateFeign;
+
+    public ResultBean<VehRebatePageVo> list(PagerQuery<VehRebatePageQuery> query) {
+        ResultBean rb = ResultBean.fireFail();
+        //返回值
+        VehRebatePageVo vehRebatePageVo = new VehRebatePageVo();
+        TotalVehRebate totalVehRebate = new TotalVehRebate();
+        List<ListVehRebate> listVehRebates = new ArrayList<>();
+        //查询条件
+        PagerQuery<ScmVehRebateStatQuery> scmVehRebateStatQueryPagerQuery = new PagerQuery<>();
+        ScmVehRebateStatQuery scmVehRebateStatQuery = new ScmVehRebateStatQuery();
+        VehRebatePageQuery params = query.getParams();
+        scmVehRebateStatQuery.setOrgPath(params.getOrgPath());
+        scmVehRebateStatQuery.setUserSid(params.getUserSid());
+        scmVehRebateStatQuery.setMenuSid(params.getMenuSid());
+        scmVehRebateStatQuery.setNames(params.getNames());
+        //发起日期查询
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                scmVehRebateStatQuery.setSaleDateStart(startDate);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                scmVehRebateStatQuery.setSaleDateEnd(endDate);
+            }
+        }
+        String date2 = params.getDate2();
+        if(StringUtils.isNotBlank(date2)){
+            String[] s = date2.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                scmVehRebateStatQuery.setAcSaleDateStart(startDate);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                scmVehRebateStatQuery.setAcSaleDateEnd(endDate);
+            }
+        }
+        scmVehRebateStatQueryPagerQuery.setParams(scmVehRebateStatQuery);
+        PagerVo<ScmVehRebateStatVo> data = scmVehRebateFeign.statistics(scmVehRebateStatQueryPagerQuery).getData();
+        for (ScmVehRebateStatVo record : data.getRecords()) {
+            ListVehRebate listVehRebate = new ListVehRebate();
+            listVehRebate.setVin(record.getVinNo());
+            listVehRebate.setSaleTime(record.getSaleDate());
+            listVehRebate.setRealSaleTime(record.getAcSaleDate());
+            listVehRebate.setRebateEstimate(record.getEstimateRebate().toString());
+            listVehRebate.setRebateUpload(record.getUploadMoney().toString());
+            listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney().toString());
+            listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney().toString());
+            listVehRebate.setRebateAdjust(record.getAdjustmentMoney().toString());
+            listVehRebate.setRebateNoUpload(record.getNotUploadMoney().toString());
+            listVehRebate.setFeesEstimate(record.getExpectCost().toString());
+            listVehRebate.setFeeUpload(record.getMoney().toString());
+            listVehRebate.setModel(record.getVehModelName());
+            listVehRebate.setBrand(record.getBrandName());
+            listVehRebate.setBuySystem(record.getPurchaseSystemName());
+            listVehRebate.setBranch(record.getUseOrgName());
+            listVehRebate.setDivision(record.getDivision());
+            listVehRebate.setSid(record.getVehSid());
+            listVehRebates.add(listVehRebate);
+        }
+        vehRebatePageVo.setList(listVehRebates);
+        vehRebatePageVo.setPages((int) data.getPages());
+        return rb.success().setData(vehRebatePageVo);
+    }
+}

anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue

@@ -5,7 +5,6 @@
         <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">生成</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -31,7 +30,7 @@
           </div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">新车主名称</div>
+              <div class="span-sty"><span class="icon">*</span>新车主名称</div>
               <el-form-item>
                 <el-select v-model="formobj.customerName" class="addinputInfo" filterable clearable placeholder="" @change="changeCustomer">
                   <el-option v-for="item in customer_list" :key="item.newCustomerSid" :label="item.vinOwner" :value="item.vinOwner"/>
@@ -39,11 +38,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">客户类型</div>
+              <div class="span-sty"><span class="icon">*</span>客户类型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.customerType }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">联系电话</div>
+              <div class="span-sty"><span class="icon">*</span>联系电话</div>
               <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -80,6 +79,23 @@
             <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
             <el-table-column prop="modelName" label="车型" align="center" min-width="130"/>
           </el-table>
+          <div class="title">附件</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">合同</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.contractFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">证件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.otherFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -184,6 +200,8 @@ export default {
         endDate: '',
         certificateAddress: '',
         loanSecondarySalesVehVoList: [],
+        contractFiles: [],
+        otherFiles: []
       },
       rules: {}
     }
@@ -275,9 +293,27 @@ export default {
       }
     },
     saveOrUpdate() {
+      if (this.formobj.customerName === '' || this.formobj.mobile === '' || this.formobj.customerType === '') {
+        this.$message({ showClose: true, type: 'error', message: '客户信息中新车主名称、客户类型、联系电话等不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
+          if (this.formobj.contractFiles.length > 0) {
+            const aa = []
+            this.formobj.contractFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.contractFiles = aa
+          }
+          if (this.formobj.otherFiles.length > 0) {
+            const bb = []
+            this.formobj.otherFiles.forEach((e) => {
+              bb.push(e.url)
+            })
+            this.formobj.otherFiles = bb
+          }
           req.save(this.formobj).then((res) => {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
@@ -291,23 +327,6 @@ export default {
         }
       })
     },
-    submit() {
-      // this.$refs['form_obj'].validate((valid) => {
-      //   if (valid) {
-      //     this.submitdisabled = true
-      //     req.saveOrUpdate(this.formobj).then((res) => {
-      //       if (res.success) {
-      //         this.$message({ showClose: true, type: 'success', message: '保存成功' })
-      //         this.handleReturn('true')
-      //       } else {
-      //         this.submitdisabled = false
-      //       }
-      //     }).catch(() => {
-      //       this.submitdisabled = false
-      //     })
-      //   }
-      // })
-    },
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {

anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue

@@ -202,7 +202,7 @@ export default {
           size: 'small',
           icon: '',
           btnKey: 'toCreate',
-          btnLabel: '生成合同'
+          btnLabel: '补充信息'
         },
         {
           type: 'primary',

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java

@@ -56,4 +56,5 @@ public class ScmVehRebateStatQuery implements Query {
     private String orgPath;
     private String menuUrl;
     private String menuSid;
+    private String names;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -361,7 +361,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         ScmVehRebateStatQuery query = pq.getParams();
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
         //========================================数据授权开始
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
@@ -423,11 +423,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(saleDateStart), "date_format (v.salesDate,'%Y-%m-%d') >= date_format('" + saleDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(saleDateEnd), "date_format (v.salesDate,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')"
                 );
-       /* String acSaleDateStart = query.getAcSaleDateStart();
+        String acSaleDateStart = query.getAcSaleDateStart();
         String acSaleDateEnd = query.getAcSaleDateEnd();
-        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
-                );*/
+        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (v.solidDate,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (v.solidDate,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
+                );
+        //移动端条件
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("r.useOrgName", query.getUseOrgName()).or().like("o.name", query.getNames()).or().like("r.vinNo", query.getNames()).or().like("r.vehModelName", query.getNames()).or().like("r.brandName", query.getNames()).or().like("r.purchaseSystemName", query.getNames()));
+        }
         qw.groupBy("r.vehSid");
         qw.orderByDesc("r.createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);

anrui-system-ui/src/views/Home/Home.vue

@@ -1,14 +1,12 @@
 <template>
   <div style="height: 100%;">
     <div class="header">
-      <p class="title"><img src="../../assets/loginImg/logo.png" />安瑞集团信息化平台</p>
-      <div class="head_info"
-        style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
+      <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
+      <div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
         <div>欢迎您</div>
         <div>
-          <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg"
-            filterable>
-            <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName" />
+          <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg" filterable>
+            <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName"/>
           </el-select>
         </div>
         <div style="padding-right: 5px">
@@ -18,10 +16,7 @@
           </el-tooltip>
         </div>
         <div>{{ name }}</div>
-        <div @click="logout()"
-          style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px">
-          <img src="@/assets/images/dy.png" />
-        </div>
+        <div @click="logout()" style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px"><img src="@/assets/images/dy.png"/></div>
       </div>
     </div>
     <div class="container1">
@@ -30,7 +25,7 @@
           <ul class="grid-content bg-ltop">
             <li @click="todowork">
               <div style="position: relative">
-                <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark" />
+                <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark"/>
                 <img src="@/assets/home/ltIcon1.png">
               </div>
               <p>待办工作</p>
@@ -41,8 +36,7 @@
             </li>
             <li @click="tobereadwork">
               <div style="position: relative">
-                <el-badge v-if="shuliang.toBeReadCount !== 0" :value="shuliang.toBeReadCount" size="mini"
-                  class="mark" />
+                <el-badge v-if="shuliang.toBeReadCount !== 0" :value="shuliang.toBeReadCount" size="mini" class="mark"/>
                 <img src="@/assets/home/ltIcon4.png">
               </div>
               <p>待阅工作</p>
@@ -55,11 +49,11 @@
         </el-col>
         <el-col :span="10">
           <div class="grid-content bg-rtop">
-            <img class="anrui" src="@/assets/home/anrui.png" />
+            <img class="anrui" src="@/assets/home/anrui.png"/>
             <p class="rt_title">通知公告</p>
             <ul>
               <li v-for="(item, index) in noticeandannouncement" :key="index" @click="lookInfo(item)">
-                <img class="rtImg" src="../../assets/home/notice.png" />
+                <img class="rtImg" src="../../assets/home/notice.png"/>
                 <span class="notice bluezi">{{ item.title }}</span>
                 <span class="anrui_time">{{ item.createTime }}</span>
               </li>
@@ -82,7 +76,7 @@
             <span>原密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.original" type="password" show-password /></el-form-item>
+            <el-form-item><el-input v-model="form.original" type="password" show-password/></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -90,7 +84,7 @@
             <span>新密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.password" type="password" show-password /></el-form-item>
+            <el-form-item><el-input v-model="form.password" type="password" show-password/></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -98,7 +92,7 @@
             <span>确认密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.confirmPassword" type="password" show-password /></el-form-item>
+            <el-form-item><el-input v-model="form.confirmPassword" type="password" show-password/></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -112,16 +106,12 @@
         <div style="text-align: center;font-weight: bold;font-size: 20px">{{ formobj.title }}</div>
         <el-row style="border-left: 0px;margin-top: 10px">
           <el-col :span="12" style="border-right: 0px;border-bottom: 0px">
-            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">发布日期:
-            </div>
-            <el-form-item><span
-                style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.createTime }}</span></el-form-item>
+            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">发布日期:</div>
+            <el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
           <el-col :span="12" style="border-right: 0px;border-bottom: 0px">
-            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">有效期至:
-            </div>
-            <el-form-item><span
-                style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.validityDate }}</span></el-form-item>
+            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">有效期至:</div>
+            <el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.validityDate }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row style="border-left: 0px">
@@ -132,9 +122,7 @@
         <el-row style="border-left: 0px">
           <el-col :span="24" style="border-right: 0px;border-bottom: 0px">
             <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">附件:</div>
-            <el-form-item><span class="bluezi" style="font-family: 'SimSun';font-weight: bold;margin-left: 60px"
-                v-for="(item, index) in formobj.filesList" :key="index"
-                @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
+            <el-form-item><span class="bluezi" style="font-family: 'SimSun';font-weight: bold;margin-left: 60px" v-for="(item, index) in formobj.filesList" :key="index" @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -143,23 +131,13 @@
 </template>
 
 <script>
-  import {
-    getStorage,
-    removeStorage
-  } from '@/utils/auth'
-  import User from '@/api/User/login.js'
-  import {
-    getLists,
-    getTodoNum
-  } from '@/api/system/home/home'
-  import {
-    getToBeReadNum
-  } from '@/api/flow/read'
-  import {
-    details
-  } from '@/api/notificationannouncement/notificationannouncement'
+import { getStorage, removeStorage } from '@/utils/auth'
+import User from '@/api/User/login.js'
+import { getLists, getTodoNum } from '@/api/system/home/home'
+import { getToBeReadNum } from '@/api/flow/read'
+import { details } from '@/api/notificationannouncement/notificationannouncement'
 
-  export default {
+export default {
   data() {
     return {
       menus: [{
@@ -264,9 +242,7 @@
           this.timer = setInterval(this.getNum, 20000)
         }
       })
-        User.getOrgListByUserSid({
-          userSid: window.sessionStorage.getItem('userSid')
-        }).then((res) => {
+      User.getOrgListByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.orgDept_list = res.data
         }
@@ -312,9 +288,7 @@
           userSid: ''
         }
         this.TZGGVisible = true
-          details({
-            sid: item.sid
-          }).then((res) => {
+        details({ sid: item.sid }).then((res) => {
           if (res.success) {
             this.formobj = res.data
           }
@@ -327,19 +301,11 @@
     },
     handleConirm() {
       if (this.form.original === '') {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '原密码不能为空'
-          })
+        this.$message({ showClose: true, type: 'error', message: '原密码不能为空' })
         return
       }
       if (this.form.password !== this.form.confirmPassword) {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '两次输入密码不一致'
-          })
+        this.$message({ showClose: true, type: 'error', message: '两次输入密码不一致' })
         return
       }
       this.form.userSid = window.sessionStorage.getItem('userSid')
@@ -361,15 +327,11 @@
         password: '',
         confirmPassword: ''
       }
-        User.logout({
-          token: getStorage()
-        }).then((res) => {
+      User.logout({ token: getStorage() }).then((res) => {
         if (res.success) {
           removeStorage()
           this.$store.commit('user/SET_UESRINFO', '')
-            this.$router.push({
-              path: '/login'
-            })
+          this.$router.push({ path: '/login' })
         }
       })
     },
@@ -395,14 +357,10 @@
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-          User.logout({
-            token: getStorage()
-          }).then(res => {
+        User.logout({ token: getStorage() }).then(res => {
           removeStorage()
           this.$store.commit('user/SET_UESRINFO', '')
-            this.$router.push({
-              path: '/login'
-            })
+          this.$router.push({ path: '/login' })
         })
       })
     },
@@ -422,88 +380,72 @@
         defaultOrgPath: this.defaultOrgPath
       }
       if (index == '0') {
-          // let myPopup = window.open('http://192.168.0.112:9531/buscenter/#/' + '?token=' + getStorage() +
-          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '1') {
-          // let myPopup = window.open('http://192.168.0.112:9532/scm/#/' + '?token=' + getStorage() +
-          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '2') {
-          // let myPopup = window.open('http://192.168.0.112:9531/riskcenter/#/' + '?token=' + getStorage() +
-          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/riskcenter/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://127.0.0.1:9531/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        } else if (index == '3') { // 车辆挂靠
-          // let myPopup = window.open('http://192.168.0.112:9531/vehfleet/#/' + '?token=' + getStorage() +
-          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/vehfleet/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+      } else if (index == '3') {
+        // let myPopup = window.open('http://127.0.0.1:9531/vehfleet/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/vehfleet/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/vehfleet/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        } else if (index == '4') {
+      }
+      else if (index == '4') {
         // let myPopup = window.open('http://127.0.0.1:9531/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '5') {
         // let myPopup = window.open('http://127.0.0.1:9531/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '6') {
         // let myPopup = window.open('http://127.0.0.1:9531/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '7') {
         // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '8') {
         // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '9') {
-          let myPopup = window.open('http://192.168.0.112:9531/as/#/' + '?token=' + getStorage() +
-            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-          // let myPopup = window.open('http://anrui.yyundong.com/as/#/' + '?token=' + getStorage() +
-          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        // let myPopup = window.open('http://127.0.0.1:9531/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         // let myPopup = window.open('http://120.46.172.184/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '10') {
         // this.$router.push({path: '/index'})
-          let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((
-            JSON
-            .stringify(organizationData))), '_blank')
+        let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       }
-        //				const page = this.$router.resolve({name: name})
-        //				window.open(page.href,'_blank')
+//				const page = this.$router.resolve({name: name})
+//				window.open(page.href,'_blank')
     }
   },
   beforeDestroy() {
     clearInterval(this.timer)
   }
-  }
+}
 </script>
 <style scoped="scoped">
-  li:hover,
-  p:hover {
+li:hover,
+p:hover {
   cursor: pointer
-  }
+}
 </style>
 <style lang="scss" scoped>
-  p {
+p {
   margin: 0;
   padding: 0;
-  }
+}
 
-  .header {
+.header {
   background-color: #0294d7;
   color: #fff;
   overflow: hidden;
@@ -533,22 +475,22 @@
   p {
     float: left;
   }
-  }
+}
 
-  //.head_info img {
-  //  width: 25px;
-  //  margin-top: 20px;
-  //  margin-left: 30px;
-  //  margin-right: 10px;
-  //  float: left;
-  //}
-  //
-  //.head_info .dy {
-  //  margin-left: 10px;
-  //  margin-right: 20px;
-  //}
+//.head_info img {
+//  width: 25px;
+//  margin-top: 20px;
+//  margin-left: 30px;
+//  margin-right: 10px;
+//  float: left;
+//}
+//
+//.head_info .dy {
+//  margin-left: 10px;
+//  margin-right: 20px;
+//}
 
-  .container1 {
+.container1 {
   background: #E9F1F7;
   padding: 20px;
   width: 100%;
@@ -665,9 +607,9 @@
       }
     }
   }
-  }
+}
 
-  .copy {
+.copy {
   position: fixed;
   bottom: 0;
   width: calc(100% - 40px);
@@ -678,26 +620,25 @@
   background: #E9F1F7;
   font-size: 14px;
   color: #666;
-  }
+}
 
-  .mark {
+.mark {
   position: absolute;
   top: 38%;
   margin-left: 58px;
-  }
+}
 
-  .mark {
+.mark {
   ::v-deep .el-badge__content {
     font-size: 14px !important;
   }
-  }
-
-  .selectStyle {
+}
+.selectStyle {
   ::v-deep .el-input__inner {
     border: 0px !important;
     background-color: #0294d7 !important;
     font-size: 17px;
     color: #FFFFFF;
   }
-  }
+}
 </style>