Merge branch 'master' of http://47.92.161.104:10080/shuzhan/shinestar-portal

src/views/base/canteenOutsourcerBalance-list.vue

@@ -59,7 +59,7 @@
       <el-table-column prop="balanceFee" label="剩余金额（元）" width="150" ></el-table-column>
       <el-table-column prop="lastRechargeTime" label="上次充值时间"  ></el-table-column>
       <el-table-column prop="lastMealTime" label="上次就餐时间" ></el-table-column>
-      <el-table-column label="操作" width="250" fixed="right">
+      <el-table-column label="操作" width="250" >
         <template slot-scope="{row}">
           <el-row>
             <el-col :span="6">

src/views/workflow/processTemplate-detail.vue

@@ -12,12 +12,12 @@
     style="text-align:left;"
     @close="closeDialog"
     :close-on-click-modal="false"
-    width="35%"
+    width="600px"
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-form-item label="模版名称" prop="name">
-            <el-input v-model="formModel.name" placeholder="请输入模版名称" ></el-input>
+            <el-input v-model="formModel.name" placeholder="请输入模版名称" style="width:420px"></el-input>
         </el-form-item>
         <el-form-item label="谁可以发起" prop="companyArray" >
             <el-select v-model="formModel.companyArray" multiple filterable  placeholder="请选择" style="width:420px">