Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/views/organization/jggl/zrbxxx/index.vue

@@ -20,7 +20,7 @@
       <el-form-item label="投保日期" prop="tbrq">
          <el-date-picker clearable
           v-model="daterangeTbrq"
-           style="width: 240px"
+           style="width: 215px"
           type="daterange"
           value-format="yyyyMMdd"
            range-separator="-"
@@ -48,8 +48,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="zrbxxxList" >
-      <el-table-column label="序号" align="center">
-            <template slot-scope="scope">
+      <el-table-column label="序号" align="center" width="80">
+            <template v-slot="scope">
               {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
             </template>
           </el-table-column>
@@ -58,12 +58,17 @@
       <el-table-column label="投保公司" align="center" prop="tbgs" />
       <el-table-column label="投保有效期(月)" align="center" prop="tbyxq" />
       <el-table-column label="投保日期" align="center" prop="tbrq" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ special(scope.row.tbrq) }}</span>
         </template>
       </el-table-column>
+	    <el-table-column label="保险合同" align="center" prop="tbhtwj" width="300">
+		    <template v-slot="scope">
+			    <file-upload v-model="scope.row.tbhtwj" :isFile="false" />
+		    </template>
+	    </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button
             size="mini"
             type="text"

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -39,7 +39,8 @@
         </template>
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
-      <el-table-column label="单位名称" align="center" prop="jgmc" />
+	    <el-table-column label="单位名称" align="center" prop="jgmc" />
+	    <el-table-column label="所属行政区划" align="center" prop="ssxzqhName" />
       <el-table-column label="申请日期" align="center" prop="sqrq" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.sqrq) }}</span>
@@ -55,7 +56,7 @@
           <dict-tag :options="dict.type.XZ070" :value="scope.row.bnLzzt" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <!---->
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.bnLzzt === '00'"