测试问题修改样式修改
This commit is contained in:
		
							parent
							
								
									82d938e60b
								
							
						
					
					
						commit
						d22e69bd5f
					
				| 
						 | 
				
			
			@ -68,33 +68,33 @@
 | 
			
		|||
        <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
 | 
			
		||||
        <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
 | 
			
		||||
        <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
 | 
			
		||||
        <el-table-column label="所属组织" align="center" prop="custOrgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
 | 
			
		||||
        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
 | 
			
		||||
        <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/> 
 | 
			
		||||
        <el-table-column label="补贴" align="center">
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="times" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true" >
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="times" width="120" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="amount" width="140" :show-overflow-tooltip="true" >
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="补贴清空" align="center">
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="clearTimes" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="clearAmount" :show-overflow-tooltip="true" >
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="clearTimes" width="120" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="clearAmount" width="140" :show-overflow-tooltip="true" >
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.clearAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="补贴撤销" align="center">
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="revocationTimes" :show-overflow-tooltip="true"/> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="revocationAmount" :show-overflow-tooltip="true">
 | 
			
		||||
            <el-table-column label="笔数" align="center" prop="revocationTimes" width="120" :show-overflow-tooltip="true"/> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="revocationAmount" width="140" :show-overflow-tooltip="true">
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.revocationAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="合计金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
 | 
			
		||||
        <el-table-column label="合计金额" align="center" prop="totalAmount" width="180" :show-overflow-tooltip="true">
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -78,30 +78,30 @@
 | 
			
		|||
        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
 | 
			
		||||
        <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/> 
 | 
			
		||||
        <el-table-column label="正常消费" align="center">
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeNum" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeAmount" :show-overflow-tooltip="true" >
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeNum" width="120" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeAmount" width="130" :show-overflow-tooltip="true" >
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.consumeAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="补扣消费" align="center">
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeRepairNum" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeRepairAmount" :show-overflow-tooltip="true" >
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeRepairNum" width="120" :show-overflow-tooltip="true" /> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeRepairAmount" width="130" :show-overflow-tooltip="true" >
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.consumeRepairAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="退单退款" align="center">
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeRefundNum" :show-overflow-tooltip="true"/> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeRefundAmount" :show-overflow-tooltip="true">
 | 
			
		||||
            <el-table-column label="次数" align="center" prop="consumeRefundNum" width="120" :show-overflow-tooltip="true"/> 
 | 
			
		||||
            <el-table-column label="金额" align="center" prop="consumeRefundAmount" width="130" :show-overflow-tooltip="true">
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.consumeRefundAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column label="合计金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
 | 
			
		||||
        <el-table-column label="合计金额" align="center" prop="totalAmount" width="180" :show-overflow-tooltip="true">
 | 
			
		||||
                <template slot-scope="scope">
 | 
			
		||||
                    <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
 | 
			
		||||
                </template>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,7 @@
 | 
			
		|||
            </el-radio-group>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
        <br>
 | 
			
		||||
        <el-form-item label="用户类别" v-if="activeName!='psn'">
 | 
			
		||||
        <el-form-item label="用户类别" v-if="activeName!='organization'">
 | 
			
		||||
            <el-select v-model="queryParams.psnTypeList" multiple style="width: 220px" clearable> 
 | 
			
		||||
                <el-option
 | 
			
		||||
                v-for="dict in dict.type.user_psn_type"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -153,8 +153,6 @@
 | 
			
		|||
          <el-col :span="1.5"> 
 | 
			
		||||
            <el-button
 | 
			
		||||
                type="success"
 | 
			
		||||
                plain
 | 
			
		||||
                icon="el-icon-edit"
 | 
			
		||||
                size="mini"
 | 
			
		||||
                :disabled="multiple"
 | 
			
		||||
                @click="handleBatchEdit" 
 | 
			
		||||
| 
						 | 
				
			
			@ -174,14 +172,19 @@
 | 
			
		|||
                :on-success="handleFileSuccess" 
 | 
			
		||||
            >
 | 
			
		||||
                <el-button
 | 
			
		||||
                  type="success"
 | 
			
		||||
                  plain
 | 
			
		||||
                  icon="el-icon-edit"
 | 
			
		||||
                  type="success"  
 | 
			
		||||
                  size="mini"  
 | 
			
		||||
                  >批量导入
 | 
			
		||||
              </el-button>
 | 
			
		||||
            </el-upload>
 | 
			
		||||
          </el-col>
 | 
			
		||||
          <!-- <el-col :span="1.5"> 
 | 
			
		||||
                <el-button
 | 
			
		||||
                  type="success"  
 | 
			
		||||
                  size="mini"  
 | 
			
		||||
                  >批量导入
 | 
			
		||||
              </el-button> 
 | 
			
		||||
          </el-col> -->
 | 
			
		||||
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 | 
			
		||||
        </el-row>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue