Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/second/segmentation/basicTable.vue

@@ -59,7 +59,7 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-         <el-table-column label="第一牵头部门" width="120" align="center">
+         <el-table-column label="牵头部门" width="120" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
@@ -69,14 +69,14 @@
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="牵头部门" width="100" align="center">
+        <el-table-column label="其他牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderDeptList | formatList }}</pre>
+            <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column label="责任领导" width="80" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+            <pre>{{ row.otherPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column

src/views/second/segmentation/constraint.vue

@@ -53,7 +53,7 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-         <el-table-column label="第一牵头部门" width="120" align="center">
+         <el-table-column label="牵头部门" width="120" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
@@ -63,14 +63,14 @@
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="牵头部门" width="100" align="center">
+        <el-table-column label="其他牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderDeptList | formatList }}</pre>
+            <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column label="责任领导" width="80" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+            <pre>{{ row.cooperateDeptList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column

src/views/second/segmentation/contentDetail.vue

@@ -35,7 +35,7 @@
             >
           </el-row>
           <el-row type="flex">
-            <el-col :span="5" class="grey"><span>第一牵头部门</span></el-col>
+            <el-col :span="5" class="grey"><span>牵头部门</span></el-col>
             <el-col :span="7"
               ><span>
                 <pre>{{ data.leaderDeptList | formatList }}</pre>
@@ -49,16 +49,16 @@
             >
           </el-row>
           <el-row type="flex">
-            <el-col :span="5" class="grey"><span>牵头部门</span></el-col>
+            <el-col :span="5" class="grey"><span>其他牵头部门</span></el-col>
             <el-col :span="7"
               ><span>
-                <pre>{{ data.leaderDeptList | formatList }}</pre>
+                <pre>{{ data.otherDeptList | formatList }}</pre>
               </span></el-col
             >
             <el-col :span="5" class="grey"><span>责任领导</span></el-col>
             <el-col :span="7"
               ><span>
-                <pre>{{ data.leaderPrincipalList | formatList }}</pre>
+                <pre>{{ data.otherPrincipalList | formatList }}</pre>
               </span></el-col
             >
           </el-row>
@@ -215,7 +215,7 @@
                   "
                 />
                 <span v-else>
-                  <pre>{{ row.leaderDeptList | formatList }}</pre>
+                  <pre>{{ row.otherDeptList | formatList }}</pre>
                 </span>
               </template>
             </el-table-column>
@@ -244,7 +244,7 @@
                   "
                 />
                 <span v-else>
-                  <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+                  <pre>{{ row.otherPrincipalList | formatList }}</pre>
                 </span>
               </template>
             </el-table-column>

src/views/second/segmentation/reward.vue

@@ -59,7 +59,7 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column label="第一牵头部门" width="120" align="center">
+        <el-table-column label="牵头部门" width="120" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
@@ -69,14 +69,14 @@
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="牵头部门" width="100" align="center">
+        <el-table-column label="其他牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderDeptList | formatList }}</pre>
+            <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column label="责任领导" width="80" align="center">
           <template slot-scope="{ row }">
-            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+            <pre>{{ row.otherPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
         <el-table-column