Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -63,3 +63,12 @@ export function selectAccountByUseOrgSid(data) {
     method: 'get'
   })
 }
+
+// 获取厂家回款通路
+export function selectNameByOrg(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/selectNameByOrg',
+    method: 'get',
+    params: data
+  })
+}

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -95,10 +95,20 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>品牌</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4" class="tleftb">
               <span><span class="icon">*</span>是否涉及车辆</span>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="8">
               <el-form-item>
                 <el-radio v-model="formobj.isVeh" label="1">是</el-radio>
                 <el-radio v-model="formobj.isVeh" label="0">否</el-radio>
@@ -126,7 +136,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="厂家销售通路" align="center">
+            <el-table-column label="厂家回款通路" align="center">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
                   <el-option v-for="item in actualPay_list" :key="item.bankAccount" :label="item.actualPay" :value="item.actualPay"/>
@@ -196,7 +206,15 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg } from '@/api/jichuxinxi/dictcommons'
+import {
+  typeValues,
+  getPathSidByUserSid,
+  fetchBySid,
+  selectByOrgSid,
+  getListOrg,
+  brandDown,
+  selectNameByOrg
+} from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 export default {
   name: 'fukuanshenqingAdd',
@@ -210,6 +228,7 @@ export default {
       index: 0,
       vehicleKey: 1,
       viewState: 1,
+      carBrand_list: [],
       costType_list: [],
       costTitle_list: [],
       payCompany_list: [],
@@ -234,6 +253,8 @@ export default {
         sid: '',
         taskId: '',
         isVeh: '',
+        carBrandName: '',
+        carBrandSid: '',
         detailsList: [],
         vehicleList: []
       },
@@ -301,9 +322,9 @@ export default {
               this.formobj.payCompany = res.data.name
             }
           })
-          req.actualList().then((resp) => {
+          brandDown({ useOrg: response.data }).then((res) => {
-            if (resp.success) {
+            if (res.success) {
-              this.actualPay_list = resp.data
+              this.carBrand_list = res.data
             }
           })
         }
@@ -330,12 +351,21 @@ export default {
         if (resp.success) {
           this.formobj = resp.data
           this.formobj.instanceId = resp.data.procInstId
+          selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+            if (res.success) {
+              this.actualPay_list = res.data
+            }
+          })
         }
       }).catch((e) => {
         this.formobj = row
       })
     },
     handleAdd() {
+      if (this.formobj.carBrandName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
+        return
+      }
       this.formobj.detailsList.push({
         actualPay: '',
         bank: '',
@@ -372,6 +402,23 @@ export default {
         })
       }
     },
+    changeCarBrand(value) {
+      let bb = null
+      this.carBrand_list.forEach((e) => {
+        if (e.brandName === value) {
+          bb = {
+            name: e.brandName,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.carBrandSid = bb.sid
+      selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+        if (res.success) {
+          this.actualPay_list = res.data
+        }
+      })
+    },
     changePaymentType(value, row) {
       let bb = null
       this.payment_list.forEach((e) => {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@@ -72,10 +72,16 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>品牌</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+          </el-col>
           <el-col :span="4" class="tleftb">
             <span>是否涉及车辆</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="8">
             <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -89,7 +95,7 @@
               <span>{{ scope.row.paymentType }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="厂家销售通路" align="center">
+          <el-table-column label="厂家回款通路" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.actualPay }}</span>
             </template>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -74,10 +74,16 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>品牌</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+          </el-col>
           <el-col :span="4" class="tleftb">
             <span>是否涉及车辆</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="8">
             <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -91,7 +97,7 @@
               <span>{{ scope.row.paymentType }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="厂家销售通路" align="center">
+          <el-table-column label="厂家回款通路" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.actualPay }}</span>
             </template>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -94,10 +94,20 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>品牌</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4" class="tleftb">
               <span><span class="icon">*</span>是否涉及车辆</span>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="8">
               <el-form-item>
                 <el-radio v-model="formobj.isVeh" label="1">是</el-radio>
                 <el-radio v-model="formobj.isVeh" label="0">否</el-radio>
@@ -195,7 +205,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 export default {
   name: 'fukuanEdit',
@@ -209,6 +219,7 @@ export default {
       index: 0,
       vehicleKey: 1,
       viewState: 1,
+      carBrand_list: [],
       costType_list: [],
       costTitle_list: [],
       payCompany_list: [],
@@ -233,6 +244,8 @@ export default {
         sid: '',
         taskId: '',
         isVeh: '',
+        carBrandName: '',
+        carBrandSid: '',
         detailsList: [],
         vehicleList: []
       },
@@ -304,9 +317,9 @@ export default {
               this.formobj.payCompany = res.data.name
             }
           })
-          req.actualList().then((resp) => {
+          brandDown({ useOrg: response.data }).then((res) => {
-            if (resp.success) {
+            if (res.success) {
-              this.actualPay_list = resp.data
+              this.carBrand_list = res.data
             }
           })
         }
@@ -322,12 +335,21 @@ export default {
         if (resp.success) {
           this.formobj = resp.data
           this.formobj.instanceId = resp.data.procInstId
+          selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+            if (res.success) {
+              this.actualPay_list = res.data
+            }
+          })
         }
       }).catch((e) => {
         this.formobj = {}
       })
     },
     handleAdd() {
+      if (this.formobj.carBrandName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
+        return
+      }
       this.formobj.detailsList.push({
         actualPay: '',
         bank: '',
@@ -364,6 +386,23 @@ export default {
         })
       }
     },
+    changeCarBrand(value) {
+      let bb = null
+      this.carBrand_list.forEach((e) => {
+        if (e.brandName === value) {
+          bb = {
+            name: e.brandName,
+            sid: e.sid
+          }
+        }
+      })
+      this.formobj.carBrandSid = bb.sid
+      selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+        if (res.success) {
+          this.actualPay_list = res.data
+        }
+      })
+    },
     changePaymentType(value, row) {
       let bb = null
       this.payment_list.forEach((e) => {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -72,10 +72,16 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>品牌</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+          </el-col>
           <el-col :span="4" class="tleftb">
             <span>是否涉及车辆</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="8">
             <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -89,7 +95,7 @@
               <span>{{ scope.row.paymentType }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="厂家销售通路" align="center">
+          <el-table-column label="厂家回款通路" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.actualPay }}</span>
             </template>

anrui-scm/anrui-scm-ui/src/api/gongyingshang/gongyingshang.js

@@ -44,6 +44,13 @@ export default {
       params: data
     })
   },
+  // 获取厂商按钮
+  saveGysByOrgSid: function(data) {
+    return request({
+      url: '/base/v1/basemanufacturer/saveGysByOrgSid/' + data,
+      method: 'get'
+    })
+  },
   // 通过sid删除一条或多条记录
   delBySids: function(data) {
     return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -14,7 +14,7 @@
           <el-col :span="24" class="tleftb">金额单位：元</el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item prop="purchaseSystemName">
               <span slot="label">采购系统：</span>
               <el-select v-model="temp.purchaseSystemName" class="addinputw" clearable placeholder="" filterable @change="orgDeptChange">
@@ -22,8 +22,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
-            <el-form-item>
+            <el-form-item prop="carBrandName">
+              <span slot="label">品牌：</span>
+              <el-select v-model="temp.carBrandName" class="addinputw" clearable placeholder="" @change="carBrandChange" filterable>
+                <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="configNameStyle">
               <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
                 <div>
                   <span slot="label"><span class="icon">*</span>车型(配置简述)：</span>
@@ -269,7 +277,7 @@
 
 <script>
 import { SaveList, Update, selVehModelByUseOrgSidAll, details } from '@/api/cheliang/basevehicle'
-import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 
 export default {
@@ -293,10 +301,12 @@ export default {
           useOrgSid: '',
           vehicleAlias: '',
           configName: '',
+          brandSid: ''
         }
       },
       FormLoading: false,
       // 下拉框
+      carBrand_list: [],
       orgDept_list: [],
       actualPay_list: [],
       vehicleState_list: [], // 库存
@@ -344,12 +354,15 @@ export default {
         manufSaleAccessSid: '',
         manufSaleAccessName: '',
         rebate1: '',
-        isProblemVeh: ''
+        isProblemVeh: '',
+        carBrandSid: '',
+        carBrandName: ''
       }, // 添加和修改
       dialogFormVisible: false, // 添加修改对话框状态
       dialogStatus: '', // 对话框状态
       rules: {
         purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }],
+        carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
         vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }],
         manPurOrderTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
         lockedStateValue: [{ required: true, message: '锁定状态不能为空', trigger: 'change' }],
@@ -401,7 +414,12 @@ export default {
       })
     },
     handSelect() {
+      if (this.temp.carBrandName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
+        return
+      }
       this.dialogVisible = true
+      this.listQuery.params.brandSid = this.temp.carBrandSid
       this.getList()
     },
     handleConfig() {
@@ -416,11 +434,6 @@ export default {
       this.temp.modelConfigSid = row.configSid
       this.temp.price = row.price
       this.temp.insideCode = row.insideCode
-      selectNameByOrg({ carBrandSid: row.carBrand }).then((respsone) => {
-        if (respsone.success) {
-          this.actualPay_list = respsone.data
-        }
-      })
     },
     showAdd() {
       this.$nextTick(() => {
@@ -451,7 +464,7 @@ export default {
       details(sid).then((response) => {
         if (response.code === '200') {
           this.temp = response.data
-          actualList({ modelSid: this.temp.modelSid }).then((respsone) => {
+          selectNameByOrg({ carBrandSid: this.temp.carBrandSid }).then((respsone) => {
             if (respsone.success) {
               this.actualPay_list = respsone.data
             }
@@ -478,6 +491,11 @@ export default {
               this.location_list = resp.data
             }
           })
+          brandDown({ useOrg: res.data }).then((resp) => {
+            if (resp.success) {
+              this.carBrand_list = resp.data
+            }
+          })
         }
       })
     },
@@ -517,6 +535,15 @@ export default {
       const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === val)
       this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid
     },
+    carBrandChange(val) {
+      const choosetItem = this.carBrand_list.filter((item) => item.brandName === val)
+      this.temp.carBrandSid = choosetItem[0].sid
+      selectNameByOrg({ carBrandSid: this.temp.carBrandSid }).then((respsone) => {
+        if (respsone.success) {
+          this.actualPay_list = respsone.data
+        }
+      })
+    },
     vehicleStateValueChange(val) {
       const choosetItem = this.vehicleState_list.filter((item) => item.dictKey === val)
       this.temp.vehicleStateValue = choosetItem[0].dictValue
@@ -585,7 +612,10 @@ export default {
         purchaseSystemName: '',
         manufSaleAccessSid: '',
         manufSaleAccessName: '',
-        rebate1: ''
+        rebate1: '',
+        carBrandSid: '',
+        carBrandName: '',
+        isProblemVeh: ''
       }
       this.$emit('doback')
     },
@@ -657,4 +687,7 @@ export default {
 /deep/ .tlineheightb .el-form-item .el-form-item__label {
   line-height: 15px !important;
 }
+/deep/ .configNameStyle .el-form-item__content {
+  margin-left: 1% !important;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@@ -13,13 +13,19 @@
           <el-col :span="24" class="tleftb">金额单位：元</el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">采购系统：</span>
               <span>{{ temp.purchaseSystemName }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">品牌：</span>
+              <span>{{ temp.carBrandName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">车型(配置简述)：</span>
               <span>{{ temp.modelName }}</span>

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue

@@ -124,6 +124,13 @@ export default {
           btnKey: 'doDel',
           btnLabel: '删除'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toChangShang',
+          btnLabel: '获取厂商'
+        },
         {
           type: 'primary',
           size: 'small',
@@ -191,6 +198,9 @@ export default {
         case 'doDel':
           this.doDel()
           break
+        case 'toChangShang':
+          this.toChangShang()
+          break
         case 'toGain':
           this.toGain()
           break
@@ -317,6 +327,14 @@ export default {
         return
       }
     },
+    toChangShang() {
+      req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '获取成功' })
+          this.getList()
+        }
+      })
+    },
     toGain() {
       req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
         if (resp.success) {

anrui-system-ui/.env.development

@@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://127.0.0.1:8111"
+VUE_APP_URL = "http://anrui.yyundong.com"
 ##VUE_APP_URL = "http://1mn7264414.qicp.vip"

anrui-system-ui/src/api/User/login.js

@@ -9,6 +9,7 @@ class user {
       data
     })
   }
+
   logout(data) { // 退出
     return request({
       url: '/portal/v1/sysuser/signOut',
@@ -16,6 +17,7 @@ class user {
       data: qs.stringify(data)
     })
   }
+
   updatePassword(data) { // 退出修改密码
     return request({
       url: '/portal/v1/sysuser/updatePassword',
@@ -23,6 +25,7 @@ class user {
       data: qs.stringify(data)
     })
   }
+
   reGetPwd(data) {
     return request({
       url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`,
@@ -30,7 +33,12 @@ class user {
       data: qs.stringify(data)
     })
   }
-
+  selectPasswordByUserSid(data) {
+    return request({
+      url: '/portal/v1/sysuser/selectPasswordByUserSid/' + data,
+      method: 'get'
+    })
+  }
 }
 
 export default new user()

anrui-system-ui/src/styles/el-form.scss

@@ -0,0 +1,67 @@
+.listconadd .title {
+  text-align: center;
+  font-size: 28px;
+  //line-height: 90px;
+}
+
+.listaddtop {
+  padding: 0 212px;
+  border-bottom: 2px solid #e0e3eb;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  line-height: 34px;
+
+  span {
+    padding: 0 15px;
+  }
+}
+
+.listconadd .demo-ruleForm {
+  padding: 22px 28px;
+}
+
+.el-collapse-item__header {
+  .el-icon-arrow-right:before {
+    content: "";
+    font-size: 20px;
+  }
+}
+
+.demo-ruleForm table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 2px solid #e0e3eb;
+  border-spacing: 0;
+  //text-align: right;
+  td {
+    border-right: 2px solid #e0e3eb;
+    border-bottom: 2px solid #e0e3eb;
+    border-top: 2px solid #e0e3eb;
+  }
+
+  tr {
+    height: 40px;
+  }
+
+  .el-form-item {
+    display: inline-block;
+  }
+
+  .el-input {
+    display: inline-block;
+  }
+}
+
+.tleftb {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
+}
+
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}

anrui-system-ui/src/styles/index.scss

@@ -7,6 +7,7 @@
 @import './e-table.scss';
 @import './element-table.scss';
 @import './element-tabs.scss';
+@import './el-form.scss';
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;

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

@@ -162,6 +162,38 @@
        <p>系统管理</p>
      </li> -->
     <!--</ul>-->
+    <el-dialog center :visible.sync="dialogVisible" width="40%" :show-close="false" :close-on-click-modal="false">
+      <el-form :model="form" class="formadd">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <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-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="handleConirm">确 定</el-button>
+        <el-button size="small" @click="handleQuXiao">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -209,6 +241,13 @@
       shuliang: {
         workCount: ''
       },
+      dialogVisible: false,
+      form: {
+        original: '',
+        password: '',
+        confirmPassword: '',
+        userSid: ''
+      },
       timer: '',
       Orgname: '',
       departmentName: '',
@@ -222,8 +261,7 @@
 
   },
   created() {
-      this.getNum()
+    this.getsPasswordByUserSid()
-      this.timer = setInterval(this.getNum, 20000)
   },
   mounted() {
     this.Orgname = window.sessionStorage.getItem('Orgname')
@@ -238,6 +276,16 @@
 //    })
   },
   methods: {
+    getsPasswordByUserSid() {
+      User.selectPasswordByUserSid(window.sessionStorage.getItem('userSid')).then((resp) => {
+        if (resp.success && resp.data) {
+          this.dialogVisible = true
+        } else {
+          this.getNum()
+          this.timer = setInterval(this.getNum, 20000)
+        }
+      })
+    },
     getNum() {
       getTodoNum(window.sessionStorage.getItem('userSid')).then((resp) => {
         if (resp.success) {
@@ -245,6 +293,42 @@
         }
       })
     },
+    handleConirm() {
+      if (this.form.original === '') {
+        this.$message({ showClose: true, type: 'error', message: '原密码不能为空' })
+        return
+      }
+      if (this.form.password !== this.form.confirmPassword) {
+        this.$message({ showClose: true, type: 'error', message: '两次输入密码不一致' })
+        return
+      }
+      this.form.userSid = window.sessionStorage.getItem('userSid')
+      User.updatePassword(this.form).then((resp) => {
+        if (resp.success) {
+          this.$alert('密码修改成功！请重新登录点击确定后退出。', '修改成功', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.handleQuXiao()
+            }
+          })
+        }
+      })
+    },
+    handleQuXiao() {
+      this.dialogVisible = false
+      this.form = {
+        original: '',
+        password: '',
+        confirmPassword: ''
+      }
+      User.logout({ token: getStorage() }).then((res) => {
+        if (res.success) {
+          removeStorage()
+          this.$store.commit('user/SET_UESRINFO', '')
+          this.$router.push({ path: '/login' })
+        }
+      })
+    },
     todowork() {
       window.open('/#/todo' + '?token=' + getStorage(), '_blank')
       // this.$router.push({ path: '/todo' + '?token=' + getStorage() })
@@ -285,7 +369,7 @@
       } else if (index == '8') {
         let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '1') {
-          let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '4') {
         let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '5') {
@@ -490,11 +574,13 @@
   font-size: 14px;
   color: #666;
 }
+
 .mark {
   position: absolute;
   top: 38%;
   margin-left: 58px;
 }
+
 .mark {
   ::v-deep .el-badge__content {
     font-size: 14px !important;