Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui
This commit is contained in:
		
						commit
						0c6ea9d45b
					
				| 
						 | 
					@ -30,7 +30,7 @@
 | 
				
			||||||
            </el-form-item>
 | 
					            </el-form-item>
 | 
				
			||||||
        </el-form>
 | 
					        </el-form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-table v-loading="loading" :data="tableList" border stripe>
 | 
					        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
 | 
				
			||||||
            <el-table-column label="序号" align="center" type="index" width="60">
 | 
					            <el-table-column label="序号" align="center" type="index" width="60">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span>{{ scope.$index + 1 }}</span>
 | 
					                    <span>{{ scope.$index + 1 }}</span>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@
 | 
				
			||||||
            </el-form-item>
 | 
					            </el-form-item>
 | 
				
			||||||
        </el-form>
 | 
					        </el-form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-table v-loading="loading" :data="tableList" border stripe>
 | 
					        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
 | 
				
			||||||
            <el-table-column label="序号" align="center" type="index" width="60">
 | 
					            <el-table-column label="序号" align="center" type="index" width="60">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span>{{
 | 
					                    <span>{{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@
 | 
				
			||||||
            </el-form-item>
 | 
					            </el-form-item>
 | 
				
			||||||
        </el-form>
 | 
					        </el-form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-table v-loading="loading" :data="tableList" border stripe>
 | 
					        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
 | 
				
			||||||
            <el-table-column label="序号" align="center" type="index" width="60">
 | 
					            <el-table-column label="序号" align="center" type="index" width="60">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span>{{
 | 
					                    <span>{{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@
 | 
				
			||||||
            </el-form-item>
 | 
					            </el-form-item>
 | 
				
			||||||
        </el-form>
 | 
					        </el-form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-table v-loading="loading" :data="tableList" >
 | 
					        <el-table v-loading="loading" :data="tableList" :max-height="650">
 | 
				
			||||||
            <el-table-column label="序号" align="center" type="index" width="60">
 | 
					            <el-table-column label="序号" align="center" type="index" width="60">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span>{{
 | 
					                    <span>{{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,7 @@
 | 
				
			||||||
            </el-form-item>
 | 
					            </el-form-item>
 | 
				
			||||||
        </el-form>
 | 
					        </el-form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-table v-loading="loading" :data="tableList" >
 | 
					        <el-table v-loading="loading" :data="tableList" :max-height="650">
 | 
				
			||||||
            <el-table-column label="序号" align="center" type="index" width="60">
 | 
					            <el-table-column label="序号" align="center" type="index" width="60">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span>{{
 | 
					                    <span>{{
 | 
				
			||||||
| 
						 | 
					@ -128,6 +128,7 @@
 | 
				
			||||||
            :total="total"
 | 
					            :total="total"
 | 
				
			||||||
            :page.sync="queryParams.pageNum"
 | 
					            :page.sync="queryParams.pageNum"
 | 
				
			||||||
            :limit.sync="queryParams.pageSize"
 | 
					            :limit.sync="queryParams.pageSize"
 | 
				
			||||||
 | 
					            :page-sizes="[10, 50, 200, 500, 2000]"
 | 
				
			||||||
            @pagination="getList"
 | 
					            @pagination="getList"
 | 
				
			||||||
            />
 | 
					            />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -701,14 +701,13 @@ export default {
 | 
				
			||||||
            this.maForm.phone = this.maForm.relPhone
 | 
					            this.maForm.phone = this.maForm.relPhone
 | 
				
			||||||
            await this.$modal
 | 
					            await this.$modal
 | 
				
			||||||
              .confirm('是否确认保存当前页面')
 | 
					              .confirm('是否确认保存当前页面')
 | 
				
			||||||
              .then(function () {})
 | 
					 | 
				
			||||||
              .then(() => {
 | 
					              .then(() => {
 | 
				
			||||||
 | 
					                this.loading = true
 | 
				
			||||||
                this.maForm.isOut = isOut
 | 
					                this.maForm.isOut = isOut
 | 
				
			||||||
                this.maForm.createBy = sessionStorage.getItem('userName')
 | 
					                this.maForm.createBy = sessionStorage.getItem('userName')
 | 
				
			||||||
                if (this.isEdit) {
 | 
					                if (this.isEdit) {
 | 
				
			||||||
                  this.maForm.leaseProjectId = this.maForm.projectId
 | 
					                  this.maForm.leaseProjectId = this.maForm.projectId
 | 
				
			||||||
                  console.log('编辑')
 | 
					                  console.log('编辑')
 | 
				
			||||||
                  this.loading = true
 | 
					 | 
				
			||||||
                  updateApplyInfo({
 | 
					                  updateApplyInfo({
 | 
				
			||||||
                    leaseApplyDetailsList: this.equipmentList,
 | 
					                    leaseApplyDetailsList: this.equipmentList,
 | 
				
			||||||
                    leaseApplyInfo: this.maForm
 | 
					                    leaseApplyInfo: this.maForm
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue