暂存

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/modules/restPassword.vue

@@ -3,7 +3,7 @@
      <el-popconfirm
       title="确定重置当前账号密码吗？"
       @confirm="resetPassword()">
-       <el-button type="primary" 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>
@@ -17,7 +17,7 @@ export default {
         "classname": "webmanage.users.users",
         "method": "resetPassword",
         "content": {
-            "userid": this.userid
+          "userid": this.userid
         }
       })
       if (res.code === 0) return this.$notify({

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -206,7 +206,7 @@
           <p class="normal-title inline-16">订单产品</p>
         </div>
         <el-row :gutter="10">
-            <tool-list ref="prolist" :data="data" :type="data.status === '提交'?'':'edit'"></tool-list>
+          <tool-list ref="prolist" :data="data" :type="data.status === '提交'?'':'edit'"></tool-list>
         </el-row>
       </div>
     </div>

src/main.js

@@ -61,6 +61,7 @@ Vue.use(ElementUI);
 ElementUI.TableColumn.props.showOverflowTooltip ={type:Boolean, default: true}
 
 ElementUI.Dialog.props.closeOnClickModal.default = false; 
+ElementUI.Drawer.props.showClose.default = false; 
 
 new Vue({
   router,