up

.env.development

@@ -2,11 +2,7 @@
 ENV = 'development'
 
 # base api
-<<<<<<< HEAD
 VUE_APP_BASE_API = ''
-=======
+VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
-VUE_APP_BASE_API = http://192.168.60.99:9003/
->>>>>>> a6c8b1e1684440c52d558eda7fdfa132ae1ca972
-#VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
 
-VUE_APP_OUT_URL = http://192.168.60.18:2021
+#VUE_APP_OUT_URL = http://192.168.60.18:2021

src/views/budget/budgetList.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div style="padding: 0 20px">
     <lx-header icon="md-apps" text="预算计划" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
@@ -37,7 +36,7 @@
       </slot>
     </lx-header>
 
-    <xy-table :table-item="table" :list="list" @delete="deleteTable" @editor="showEditor" :show-summary="true"
+    <xy-table ref="xyTable" :table-item="table" :list="list" @delete="deleteTable" @editor="showEditor" :show-summary="true"
       :summary-method="summary">
 
     </xy-table>
@@ -352,6 +351,9 @@
     methods: {
       //合计
       summary(param) {
+        this.$nextTick(() => {
+          this.$refs['xyTable'].$children[0].doLayout()
+        })
         const {
           columns,
           data
@@ -485,12 +487,6 @@
     mounted() {
       this.getDepartment()
       this.getBudgets()
-    },
-    updated() {
-      console.log(this.$refs['table'])
-      this.$nextTick(() => {
-        this.$refs.addBudget.$refs.table.doLayout();
-      })
     }
   }
 </script>
@@ -516,5 +512,5 @@
       right: 30px;
       z-index: 2;
     }
-  }
+  }
-  </style>
+</style>

src/views/contract/contractList.vue

@@ -508,7 +508,7 @@ export default {
         {
           label:'已付金额',
           prop:'fund_log_total',
-          width:180,
+          width:120,
           align:'right',
           formatter:(cell,data,value)=>{
             if(!value){
@@ -519,7 +519,7 @@ export default {
         },
         {
           label:"合同预算价(万元)",
-          width: 200,
+          width: 160,
           prop:"plan_price",
           align:'right',
           formatter:(v1,v2,value)=>{
@@ -528,7 +528,7 @@ export default {
         },
         {
           label:'合同签订价（万元）',
-          width: 200,
+          width: 180,
           prop:'money',
           align:'right'
         },

src/views/contract/seeContract.vue

@@ -329,7 +329,7 @@ export default {
         {
           label:'已付金额',
           prop:'fund_log_total',
-          width:180,
+          width:120,
           align:'right',
           formatter:(cell,data,value)=>{
             if(!value){
@@ -340,7 +340,7 @@ export default {
         },
         {
           label:"合同预算价(万元)",
-          width: 200,
+          width: 160,
           prop:"plan_price",
           align:'right',
           formatter:(v1,v2,value)=>{
@@ -349,7 +349,7 @@ export default {
         },
         {
           label:'合同签订价（万元）',
-          width: 200,
+          width: 180,
           prop:'money',
           align:'right'
         },
@@ -892,4 +892,3 @@ export default {
   }
 }
 </style>
-

src/views/system/user.vue

@@ -24,6 +24,11 @@
           </el-table-column>
           <el-table-column prop="username" label="用户名">
           </el-table-column>
+          <el-table-column prop="department" label="部门">
+            <template slot-scope="scope">
+              {{scope.row.department?scope.row.department.name:""}}
+            </template>
+          </el-table-column>
           <el-table-column prop="address" label="角色">
             <template slot-scope="scope">
               <el-tag size="medium" v-for="(item,index) in scope.row.roles" style="margin-right: 10px;">{{ item.name }}

vue.config.js

@@ -46,8 +46,8 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        //target: 'http://hdcontract.ali251.langye.net',
+        target: 'http://hdcontract.ali251.langye.net',
-        target: 'http://192.168.60.99:9003/',
+        //target: 'http://192.168.60.99:9003/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''