暂存

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -168,7 +168,7 @@
         </el-table-column>
         <el-table-column
             prop="amount"
-            label="总金额(元)"
+            label="金额(元)"
             fixed="right"
             width="100">
           <template slot-scope="scope">
@@ -178,7 +178,7 @@
       </el-table>
       <div style="margin-top:16px;">
         <div style="float: left">
-          <span>总金额(元)：{{tool.formatAmount(totalPrice,2)}}</span>
+          <span>金额(元)：{{tool.formatAmount(totalPrice,2)}}</span>
         </div>
         <div style="float: right">
           <el-pagination
@@ -250,11 +250,10 @@ export default {
       this.params.content.sa_projectid = this.data.sa_projectid
       const res = await this.$api.requested(this.params)
       this.list = res.data
-      res.data.forEach((e,index)=>{
+      /*res.data.forEach((e,index)=>{
         this.totalPrice = this.totalPrice + e.amount
-      })
-      console.log(this.data.discountrate)
-      console.log(this.discountrate)
+      })*/
+      this.totalPrice = res.tips.amount
       this.total = res.total
     },
     handleSizeChange(val) {

src/HManagement/department/staff/detail/index.vue

@@ -17,6 +17,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
+        <restPas class="inline-16" :data="mainData"></restPas>
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
         <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
       </div>

src/HManagement/department/staff/detail/modules/restPassword.vue

@@ -3,20 +3,21 @@
      <el-popconfirm
       title="确定重置当前账号密码吗？"
       @confirm="resetPassword()">
-       <el-button type="text" slot="reference" size="small" style="margin:-4px 0 0 10px">重置</el-button>
+       <el-button type="primary"   slot="reference" size="mini" >重置</el-button>
     </el-popconfirm>
   </div>
 </template>
 
 <script>
 export default {
+  props:["data"],
   methods:{
     async resetPassword () {
       const res = await this.$api.requested({
         "classname": "webmanage.users.users",
         "method": "resetPassword",
         "content": {
-            "userid": this.$route.query.id
+            "userid": this.data.userid
         }
       })
       if (res.code === 0) return this.$notify({