Merge remote-tracking branch 'origin/master'

src/views/modules/cw/workContract/ContractRegistration.vue

@@ -66,7 +66,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="归档状态" prop="filedType">
+      <el-form-item label="电子归档" prop="filedType">
         <el-select v-model="searchForm.filedType" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in $dictUtils.getDictList('filed_type')"
@@ -130,19 +130,19 @@
               <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>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="归档状态" field="filedType">
+          <vxe-column width="200px" title="电子归档" field="filedType">
             <template slot-scope="scope">
               <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="borrowType" >
+          <vxe-column width="200px" title="纸质归档" field="filedPaperType">
             <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>
+              <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="filedPaperType">
+          <vxe-column width="200px"  title="借用状态" field="borrowType" >
             <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>
+              <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>