Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

src/views/claimAndRefund/receive/agreement.vue

@@ -214,12 +214,12 @@
                 prop="planStartTime"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
+<!--            <el-table-column
                 label="租赁期限(天)"
                 align="center"
                 prop="leaseDay"
                 :show-overflow-tooltip="true"
-            />
+            />-->
             <el-table-column
                 label="授权人"
                 align="center"
@@ -363,7 +363,7 @@
                             ></el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+<!--                    <el-col :span="12">
                         <el-form-item label="租赁期限(天)" prop="leaseDay">
                             <el-input-number
                                 v-model="form.leaseDay"
@@ -374,7 +374,7 @@
                                 style="width: 100%"
                             />
                         </el-form-item>
-                    </el-col>
+                    </el-col>-->
                 </el-row>
 
                 <el-row>

src/views/material/lease/protocol/index.vue

@@ -71,7 +71,7 @@
       <el-table-column label="租赁单位" align="center" prop="unitName" width="150"/>
       <el-table-column label="租赁工程" align="center" prop="projectName" width="150"/>
       <el-table-column label="开始日期" align="center" prop="planStartTime" width="120"/>
-      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>
+<!--      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>-->
       <el-table-column label="授权人" align="center" prop="authPerson" width="100"/>
       <el-table-column label="授权人电话" align="center" prop="phone" width="120"/>
       <el-table-column label="租赁单位类型" align="center" width="100">
@@ -98,20 +98,20 @@
       <el-table-column label="操作" align="center" width="240" fixed="right">
         <template slot-scope="scope">
           <el-button
-            size="mini" 
+            size="mini"
             @click="handleView(scope.row)"
           >
             查看
           </el-button>
           <el-button
-            size="mini" type="primary" 
+            size="mini" type="primary"
             @click="handleUpdate(scope.row)"
           >
             编辑
           </el-button>
           <el-button
             size="mini"
-            type="danger" 
+            type="danger"
             @click="handleDelete(scope.row)"
           >
             删除
@@ -132,7 +132,7 @@
     <el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="12"> 
+          <el-col :span="12">
             <el-form-item label="租赁单位" prop="unitId" >
               <treeselect
                   v-model="form.unitId" :disabled="isEdits"
@@ -140,7 +140,7 @@
                   :show-count="true"  style="width: 100%;" :disable-branch-nodes="true"
                   noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
                   placeholder="请选择租赁单位"
-              /> 
+              />
               <!-- <el-cascader
                 v-model="unitId"
                 :show-all-levels="false"
@@ -154,8 +154,8 @@
                 style="width: 100%;"
                 :disabled="isEdits"
               ></el-cascader> -->
-            </el-form-item> 
-          </el-col> 
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="授权人" prop="authPerson">
               <el-input
@@ -191,7 +191,7 @@
                 style="width: 100%;"
                 :disabled="isEdits"
               ></el-cascader> -->
-            </el-form-item> 
+            </el-form-item>
           </el-col>
 
 
@@ -220,7 +220,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+<!--          <el-col :span="12">
             <el-form-item label="租赁期限(天)" prop="leaseDay">
               <el-input-number
                 v-model="form.leaseDay"
@@ -232,7 +232,7 @@
                 :disabled="isEdits"
               />
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
 
         <el-row>
@@ -339,9 +339,9 @@
         <el-descriptions-item label="合同编号">
           {{ form.contractCode }}
         </el-descriptions-item>
-        <el-descriptions-item label="租赁期限(天)">
+<!--        <el-descriptions-item label="租赁期限(天)">
           {{ form.leaseDay }}
-        </el-descriptions-item>
+        </el-descriptions-item>-->
         <el-descriptions-item label="开始日期">
           {{ form.planStartTime }}
         </el-descriptions-item>
@@ -475,7 +475,7 @@ import {listUser} from "@/api/system/user";
 import {getListProject, getListUnite} from "@/api/lease/apply";
 
 import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css' 
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   name: "supplier",
@@ -686,7 +686,7 @@ export default {
         this.delBusinessFileIdList.push(file.url);
       }
       console.log('delBusinessFileIdList', this.delBusinessFileIdList)
-    }, 
+    },
     isImage(file) {
       this.urlTemp = require('@/assets/file.png');
       if (this.updataIf(file)) {
@@ -714,7 +714,7 @@ export default {
           return true
         }
       }
-    }, 
+    },
     handleDownload(file) {
       console.log(file)
       if (file.status === 'ready') {
@@ -724,7 +724,7 @@ export default {
         downloadFileData({fileName: file.name, fileUrl: file.url})
         // downloadFileData({ fileName: file.name,fileUrl:file.url })
       }
-    }, 
+    },
     handleChangeBusinessList(file, fileList) {
       const fileListTemp = fileList.filter(item => {
         return item.uid != file.uid
@@ -784,7 +784,7 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-    }, 
+    },
     /** 转换菜单数据结构 */
     normalizer(node) {
         if (node.children && !node.children.length) {
@@ -795,20 +795,20 @@ export default {
             label: node.name,
             children: node.children,
         };
-    }, 
+    },
     //获取单位类型 ,getUnitList, getProjectList
     getUnitList() {
       getListUnite({projectId: null}).then((response) => {
         this.uniteList = response.data;
       });
-    }, 
+    },
     getProjectList() {
       getListProject({unitId: null}).then((response) => {
         this.projectList = response.data;
       });
     },
 
-    uniteChange(val) { 
+    uniteChange(val) {
       if (val && val.length > 0) {
         this.maForm.unitId = this.unitId[this.unitId.length - 1];
       } else if (val && val.length == 0) {