zhengqiang 5 éve
szülő
commit
b4dc36da83

+ 12 - 4
src/views/base/checkinInfo-detail.vue

@@ -50,16 +50,19 @@
             :options="companyResult"
             v-model="formModel.companyId"
             style="width: 300px"
+            size="mediumn"
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="联系人" prop="artificialPerson">
-          <el-select-tree
+          <el-select
             filterable
-            :props="personProps"
-            :options="personResult"
             v-model="formModel.artificialPerson"
             style="width: 300px"
-          ></el-select-tree>
+          >
+            <el-option v-for="person in personResult" 
+              :key="person.id" :value="person.id" :label="person.name">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="法人" prop="boss">
           <el-input
@@ -187,6 +190,7 @@ export default {
         var self = this;
         var formData = new FormData();
         formData.append("companyId", val);
+
         personInfoApi.findByCompanyId(formData).then(function(response) {
           var jsonData = response.data;
           if (jsonData.result) {
@@ -252,6 +256,10 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+          
+          //var personId = self.formModel.artificialPerson;
+          //实际保存为personId,但数据库中是varchar类型
+          //self.formModel.artificialPerson = parseInt(personId);
         } else {
           self.$message.error(jsonData.message + "");
         }

+ 48 - 34
src/views/business/billPush-detail-list.vue

@@ -113,7 +113,11 @@
                 <el-table-column prop="beginEndTime" label="起止时间" width="300"></el-table-column>
                 <el-table-column prop="num" label="数量" width="300"></el-table-column>
                 <el-table-column prop="standard" label="收费标准(元)"></el-table-column>
-                <el-table-column prop="totalFee" label="收费金额(元)"></el-table-column>
+                <el-table-column prop="totalFee" label="收费金额(元)">
+                    <template slot-scope="{row}">
+                        {{fmtMoney(row.totalFee)}}
+                    </template>
+                </el-table-column>
             </el-table>
             <el-pagination style="text-align: center;"
                 :current-page.sync="pageIndex"
@@ -216,44 +220,53 @@ export default {
 
 
             billPushApi.goodsPageList(formData)
-                .then(function(response) {
-                    self.loading = false;
-
-                    var jsonData = response.data;
+            .then(function(response) {
+                self.loading = false;
 
-                    if(jsonData.result) {
-                        if(exportFlag){
-                            //导出
-                            self.$message({
-                                showClose: true,
-                                type: "success",
-                                message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                                dangerouslyUseHTMLString: true,
-                                duration: 30000
-                            });
-                        }
-                        else{
-                            //分页查看
-                            var page = jsonData.data;
+                var jsonData = response.data;
 
-                            self.tableData = page.data;
-                            self.totalPages = page.totalPages;
-                            self.totalElements = page.recordsTotal;
-                        }
+                if(jsonData.result) {
+                    if(exportFlag){
+                        //导出
+                        self.$message({
+                            showClose: true,
+                            type: "success",
+                            message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
+                            dangerouslyUseHTMLString: true,
+                            duration: 30000
+                        });
                     }
                     else{
-                        self.$message.warning(jsonData.message);
+                        //分页查看
+                        var page = jsonData.data;
+
+                        self.tableData = page.data;
+                        self.totalPages = page.totalPages;
+                        self.totalElements = page.recordsTotal;
                     }
+                }
+                else{
+                    self.$message.warning(jsonData.message);
+                }
 
-                    // self.tableData = jsonData.data;
-                    // self.totalPages = jsonData.totalPages;
-                    // self.totalElements = jsonData.recordsTotal;
-                })
-                .catch(error => {
-                    self.loading = false;
-                    // self.$message.error(error + "");
-                });
- 
+                // self.tableData = jsonData.data;
+                // self.totalPages = jsonData.totalPages;
+                // self.totalElements = jsonData.recordsTotal;
+            })
+            .catch(error => {
+                self.loading = false;
+                // self.$message.error(error + "");
+            }); 
+        },
+        fmtMoney(value){
+            const num = Number(value);
+            
+            if (!isNaN(num)) {
+                return num.toFixed(2);
+            }
+            else{
+                return num;
+            }
         },
         pageSizeChange(pageSize) {
             this.pageSize = pageSize;
@@ -285,7 +298,8 @@ export default {
                         return prev;
                     }
                     }, 0);
-                    sums[5] ;
+                    
+                    sums[5] = this.fmtMoney(sums[5]);
                 } else {
                     sums[index] = '';
                 }

+ 3 - 3
src/views/business/billPush-list.vue

@@ -421,9 +421,9 @@ export default {
             //保存成功后回调
             this.showModal2 = false;
 
-            this.changePage(this.pageIndex);
-
-            
+            if(retObj){
+                this.changePage(this.pageIndex);
+            }            
         },
         onDetailModalClose3(retObj) {
             //保存成功后回调

+ 12 - 2
src/views/sys/user-detail.vue

@@ -29,14 +29,20 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="所属单位" prop="companyId">
-          <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
+          <!-- <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
             <el-option
               v-for="company in companyResult"
               :key="company.id"
               :label="company.name"
               :value="company.id"
             ></el-option>
-          </el-select>
+          </el-select> -->
+          <el-select-tree
+          size="mediumn"
+          :options="companyResult"
+          v-model="formModel.companyId"
+          width="300px"
+        ></el-select-tree>
         </el-form-item>
         <el-form-item label="分配角色" prop="roles">
           <el-select
@@ -68,6 +74,7 @@
 import Constant from "@/constant";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
+import SelectTree from "@/components/SelectTree";
 
 export default {
   props: ["businessKey", "title", "companyResult"],
@@ -172,6 +179,9 @@ export default {
         self.$message.error(error + "");
         self.loading = false;
       });
+  },
+  components: {
+    "el-select-tree": SelectTree
   }
 };
 </script>