zhengqiang 5 yıl önce
ebeveyn
işleme
978bab0298

+ 2 - 2
.env.development

@@ -1,9 +1,9 @@
 OUT_PUT_DIR=dist/jp-housekeeper-portal
 
 #VUE_APP_BACKEND_URL=http://127.0.0.1:7070/xpgj
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
-#VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

+ 18 - 17
src/views/base/companyPayment-detail.vue

@@ -5,6 +5,7 @@
         :modal-append-to-body="false"
         style="text-align: left"
         @close="closeDialog"
+        width="1000px"
         :close-on-click-modal="false"
       >
       <div class="user-panel" v-loading="loading">
@@ -12,7 +13,7 @@
             ref="form"
             :model="formModel"
             :rules="ruleValidate"
-            :label-width="'180px'"
+            :label-width="'150px'"
             inline
         >
             <el-form-item label="物业公司" prop="companyId">
@@ -29,83 +30,83 @@
                     :options="treeData"
                     v-model="formModel.companyId"
                     height="200"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-select-tree>
             </el-form-item>
             <el-form-item label="账户名称" prop="name">
                 <el-input
                     v-model="formModel.name"
                     placeholder="请输入账户名称"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="结算周期" prop="cycle">
                 <el-input
                     v-model="formModel.cycle"
                     placeholder="结算周期"
-                    style="width: 400px"
+                    style="width: 300px"
                 >
                      <template slot="append">天以内</template>
                 </el-input>
             </el-form-item>
-            <el-form-item label="微信mchId" prop="mchId">
+            <el-form-item label="微信商户号" prop="mchId">
                 <el-input
                     v-model="formModel.mchId"
                     placeholder="请输入微信mchId"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="微信subMchId" prop="subMchId">
+            <el-form-item label="微信子商户号" prop="subMchId">
                 <el-input
                     v-model="formModel.subMchId"
                     placeholder="请输入微信subMchId"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="支付宝appAuthToken" prop="appAuthToken">
+            <el-form-item label="支付宝令牌" prop="appAuthToken">
                 <el-input
                     v-model="formModel.appAuthToken"
                     placeholder="请输入支付宝appAuthToken"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="开户名称" prop="bankName">
                 <el-input
                     v-model="formModel.bankName"
                     placeholder="请输入开户名称"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
                         <el-form-item label="开户银行" prop="bank">
                 <el-input
                     v-model="formModel.bank"
                     placeholder="请输入开户银行"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="账号" prop="account">
                 <el-input
                     v-model="formModel.account"
                     placeholder="请输入账号"
-                    style="width: 400px"
+                    style="width: 300px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="财务人员手机账户" prop="financePersonId">
-                <el-select v-model="formModel.financePersonId" filterable style="width: 400px">
+                <el-select v-model="formModel.financePersonId" filterable style="width: 300px">
                     <el-option
                         v-for="result in personList"
                         :key="result.id"
-                        :label="result.name"
+                        :label="result.name + '(' + result.phone + ')'"
                         :value="result.id"
                     ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="财务人员后台账户" prop="financeUserId">
-                <el-select v-model="formModel.financeUserId" filterable style="width: 400px">
+                <el-select v-model="formModel.financeUserId" filterable style="width: 300px">
                     <el-option
                         v-for="result in userList"
                         :key="result.id"
-                        :label="result.realName"
+                        :label="result.realName + '(' + result.userName + ')'"
                         :value="result.id"
                     ></el-option>
                 </el-select>

+ 7 - 3
src/views/base/companyPayment-list.vue

@@ -75,7 +75,11 @@
             >
             <el-table-column prop="companyName"  label="物业公司" ></el-table-column>
             <el-table-column prop="name"  label="账户名称" ></el-table-column>
-            <el-table-column prop="cycle"  label="结算周期"  ></el-table-column>
+            <el-table-column prop="cycle"  label="结算周期"  >
+                <template slot-scope="{row}">
+                    {{row.cycle}}天以内
+                </template>
+            </el-table-column>
             <el-table-column prop="mchId"  label="微信mchId" ></el-table-column>
             <el-table-column prop="subMchId"  label="微信subMchId" ></el-table-column>
             <el-table-column prop="appAuthToken"  label="支付宝appAuthToken"  ></el-table-column>
@@ -83,7 +87,7 @@
             <el-table-column prop="bank"  label="开户银行"  ></el-table-column>
             <el-table-column prop="account"  label="账号"  ></el-table-column>
             <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
-            <el-table-column prop="isDefault"  label="是否默认账户"  >
+            <el-table-column prop="isDefault"  label="默认账户">
                 <template slot-scope="{row}">
                     <el-switch
                         v-model="row.isDefault"
@@ -113,7 +117,7 @@
                     </el-switch>
                 </template>
             </el-table-column> -->
-            <el-table-column label="操作" fixed="right" width="130px">
+            <el-table-column label="操作" fixed="right" width="180px">
                 <template slot-scope="{row}">
                 <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
                 <el-link size="mini" type="warning" @click="handleManagePayService(row)">收费项目</el-link>-