lizhenhao 2 éve
szülő
commit
28eecc6f29

+ 11 - 11
src/views/modules/cw/workContract/ContractRegistration.vue

@@ -121,20 +121,20 @@
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--          <vxe-column type="checkbox" width="40px"></vxe-column>-->
 
-          <vxe-column width="200px" title="合同编号" field="contractNo"></vxe-column>
-          <vxe-column width="200px" title="合同名称" field="contractName">
+          <vxe-column min-width="200px" align="center" title="合同名称" field="contractName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw:workContract:edit')" @click="view(scope.row.id)">{{scope.row.contractName}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('cw:workContract:view')" @click="view(scope.row.id)">{{scope.row.contractName}}</el-link>
               <span v-else>{{scope.row.contractName}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="案卷号" field="filedNo"></vxe-column>
-          <vxe-column width="200px" title="签约日期" field="signingDate"></vxe-column>
-          <vxe-column width="200px" title="合同金额(元)" field="contractAmount"></vxe-column>
-          <vxe-column width="200px" title="所属部门" field="departmentName"></vxe-column>
-          <vxe-column width="200px" title="创建人" field="createBy"></vxe-column>
-          <vxe-column width="200px" title="创建日期" field="createDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="合同编号" field="contractNo"></vxe-column>
+          <vxe-column min-width="150" align="center" title="案卷号" field="filedNo"></vxe-column>
+          <vxe-column min-width="150" align="center" title="签约日期" field="signingDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="合同金额(元)" field="contractAmount"></vxe-column>
+          <vxe-column min-width="150" align="center" title="所属部门" field="departmentName"></vxe-column>
+          <vxe-column min-width="150" align="center" title="创建人" field="createBy"></vxe-column>
+          <vxe-column min-width="150" align="center" title="创建日期" field="createDate"></vxe-column>
 <!--          <vxe-column width="200px" title="状态" field="status">-->
 <!--            <template slot-scope="scope">-->
 <!--              <el-button  type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("cw_status", scope.row.status, '-')}} </el-button>-->
@@ -145,19 +145,19 @@
 <!--              <el-button  type="text" @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '未归档')}} </el-button>-->
 <!--            </template>-->
 <!--          </vxe-column>-->
-          <vxe-column width="200px" title="纸质归档" field="filedPaperType">
+          <vxe-column min-width="100px" title="纸质归档" fixed="right" align="center" field="filedPaperType">
             <template slot-scope="scope">
               <el-button  type="text" @click="detailPaperFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedPaperType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedPaperType, '未归档')}} </el-button>
             </template>
           </vxe-column>
-          <vxe-column width="200px"  title="借用状态" field="borrowType" >
+          <vxe-column min-width="100px"  title="借用状态" fixed="right" align="center" field="borrowType" >
             <template slot-scope="scope">
               <el-button  type="text" @click="detailBorrow(scope.row)" :type="$dictUtils.getDictLabel('borrow_type_status', scope.row.borrowType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '未借用')}} </el-button>
             </template>
           </vxe-column>
 
 
-          <vxe-column title="操作" width="200px" fixed="right" align="center">
+          <vxe-column title="操作" min-width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
 <!--              <el-button v-if="hasPermission('cw:workContract:view')" type="text" size="small" @click="view(scope.row.id)">查看</el-button>-->
 <!--              <el-button v-if="hasPermission('cw:workContract:edit') && scope.row.status !== '2' && scope.row.status !== '5' && scope.row.createId === $store.state.user.id" type="text" size="small" @click="edit(scope.row)">修改</el-button>-->

+ 8 - 8
src/views/modules/cw/workContract/WorkContractBorrowMessageForm.vue

@@ -3,7 +3,7 @@
     :title="title"
     :close-on-click-modal="false"
     v-dialogDrag
-    width="1200px"
+    width="1000px"
     @close="close()"
     :visible.sync="visible">
   <div class="page">
@@ -13,7 +13,7 @@
                 border="inner"
                 auto-resize
                 resizable
-                height="500px"
+                max-height="500px"
                 :loading="loading"
                 size="small"
                 ref="workClientTable"
@@ -26,16 +26,16 @@
                 :data="dataList"
                 :checkbox-config="{}">
 
-                <vxe-column width="300px" title="合同名称" field="contractName"></vxe-column>
-                <vxe-column width="100px" title="借用人" field="borrowName" ></vxe-column>
-                <vxe-column width="100px" title="借用状态" field="borrowType" >
+                <vxe-column min-width="300px" align="center" title="合同名称" field="contractName"></vxe-column>
+                <vxe-column min-width="120px" align="center" title="借用人" field="borrowName" ></vxe-column>
+                <vxe-column min-width="120px" align="center" title="借用状态" field="borrowType" >
                   <template slot-scope="scope">
                     {{ $dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '-') }}
                   </template>
                 </vxe-column>
-                <vxe-column width="200px" title="借用时间" field="borrowData" ></vxe-column>
-                <vxe-column width="200px" title="大概归还时间" field="borrowRetData" ></vxe-column>
-                <vxe-column width="200px" title="实际归还时间" field="retData">
+                <vxe-column min-width="120px" align="center" title="借用时间" field="borrowData" ></vxe-column>
+                <vxe-column min-width="120px" align="center" title="大概归还时间" field="borrowRetData" ></vxe-column>
+                <vxe-column min-width="120px" align="center" title="实际归还时间" field="retData">
                   <template slot-scope="scope">
                     {{getRetData(scope.row.retData)}}
                   </template>