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

src/views/chain/assessmentContent/software.vue

@@ -40,6 +40,7 @@
           </el-row>
         </div>
         <div class="body" :style="{ height: tableHeight + 'px' }">
+          <div class="title">软件与人工智能产业链</div>
           <div v-for="(data, index) of dataList" :key="index">
             <div class="title">121212</div>
             <el-row

src/views/second/assessmentResults/results/basicTarget.vue

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

src/views/second/assessmentResults/results/constraint.vue

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

src/views/second/assessmentResults/results/reward.vue

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

src/views/second/assessmentResults/scoreRules/basicTarget.vue

@@ -54,7 +54,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+       <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/assessmentResults/scoreRules/constraint.vue

@@ -48,7 +48,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+       <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/assessmentResults/scoreRules/reward.vue

@@ -54,7 +54,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+      <el-table-column label="第一牵头部门" width="120" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderDeptList | formatList }}</pre>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任领导" width="80" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+        </template>
+      </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/applyCooperation/basicTarget.vue

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

src/views/second/coordinationManage/applyCooperation/constraint.vue

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

src/views/second/coordinationManage/applyCooperation/reward.vue

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

src/views/second/coordinationManage/approvalCooperation/basicTarget.vue

@@ -64,7 +64,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+       <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/approvalCooperation/constraint.vue

@@ -57,7 +57,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+       <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/approvalCooperation/reward.vue

@@ -64,7 +64,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+      <el-table-column label="第一牵头部门" width="120" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderDeptList | formatList }}</pre>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任领导" width="80" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+        </template>
+      </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/cooperateList/basicTarget.vue

@@ -64,7 +64,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+      <el-table-column label="第一牵头部门" width="120" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderDeptList | formatList }}</pre>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任领导" width="80" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+        </template>
+      </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/cooperateList/constraint.vue

@@ -58,7 +58,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+      <el-table-column label="第一牵头部门" width="120" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderDeptList | formatList }}</pre>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任领导" width="80" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+        </template>
+      </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/coordinationManage/cooperateList/reward.vue

@@ -64,7 +64,16 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-
+      <el-table-column label="第一牵头部门" width="120" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderDeptList | formatList }}</pre>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任领导" width="80" align="center">
+        <template slot-scope="{ row }">
+          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+        </template>
+      </el-table-column>
       <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>

src/views/second/segmentation/basicTable.vue

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

src/views/second/segmentation/constraint.vue

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

src/views/second/segmentation/contentDetail.vue

@@ -34,6 +34,16 @@
               ><span>{{ data.points }}</span></el-col
             >
           </el-row>
+          <el-row type="flex">
+            <el-col :span="5" class="grey"><span>第一牵头部门</span></el-col>
+            <el-col :span="7"
+              ><span><pre>{{ data.leaderDeptList | 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></span></el-col
+            >
+          </el-row>
           <el-row type="flex">
             <el-col :span="5" class="grey"><span>牵头部门</span></el-col>
             <el-col :span="7"
@@ -97,7 +107,7 @@
             <el-table-column
               label="小项内容"
               align="center"
-              min-width="150"
+              min-width="120"
               max-width="200"
             >
               <template slot-scope="{ row }">

src/views/second/segmentation/reward.vue

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

src/views/second/taskSummary/basicTable.vue

@@ -58,6 +58,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
+        <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
         <el-table-column label="牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
@@ -274,7 +284,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="title">分值：</el-col>
-            <el-col :span="7"><el-input placeholder="请输入分值"></el-input></el-col>
+            <el-col :span="7"><el-input placeholder="请输入分值" v-model="form.points"></el-input></el-col>
           </el-row>
         </div>
         <div slot="footer">

src/views/second/taskSummary/constraint.vue

@@ -52,6 +52,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
+         <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
         <el-table-column label="牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
@@ -107,127 +117,176 @@
         @current-change="getDataList()"
       />
     </el-card>
-    <el-dialog
-      title="编辑考核内容"
-      :visible.sync="showEdit"
-      width="400px"
-      custom-class="ele-dialog-form"
-      :lock-scroll="false"
-      :destroy-on-close="true"
-      @closed="form = {}"
-    >
-      <el-form
-        :model="form"
-        label-width="82px"
-        custom-class="editForm"
-        @keyup.enter.native="save"
-        @submit.native.prevent
-        ref="editForm"
+   <el-dialog
+        title="编辑考核内容"
+        :visible.sync="showEdit"
+        width="650px"
+        custom-class="ele-dialog-form"
+        :lock-scroll="false"
+        :destroy-on-close="true"
+        @closed="form = {}"
       >
-        <el-form-item label="小条内容：">
-          <el-input
-            v-model="form.itemContent"
-            type="textarea"
-            :rows="5"
-            placeholder="请输入考核内容"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="分值：" prop="">
-          <el-input placeholder="请输入分值"></el-input>
-        </el-form-item>
-
-        <el-form-item label="牵头部门：">
-          <treeselect
-           v-model="form.leaderDept"
-            :flat="true"
-            :options="formatDep"
-            :multiple="true"
-            placeholder="请选择牵头部门"
-            :defaultExpandLevel="2"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.name,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="责任领导：">
-           <treeselect
-            :multiple="true"
-            v-model="form.leaderPrincipal"
-            :options="principalList"
-            placeholder="请选择牵头部门责任领导"
-            :defaultExpandLevel="1"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.realname,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="配合部门：">
-          <treeselect
-            v-model="form.cooperateDept"
-            :flat="true"
-            :options="formatDep"
-            :multiple="true"
-            placeholder="请选择配合部门"
-            :defaultExpandLevel="2"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.name,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="责任领导：">
-           <treeselect
-            :multiple="true"
-            v-model="form.cooperatePrincipal"
-            :options="principalList"
-            placeholder="请选择配合部门责任领导"
-            :defaultExpandLevel="1"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.realname,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button @click="showEdit = false">取消</el-button>&nbsp;
-      </div>
-    </el-dialog>
+        <el-row>
+          <el-col :span="4" class="title">考核内容：</el-col>
+          <el-col :span="18"
+            ><el-input
+              type="textarea"
+              :rows="4"
+              placeholder="请输入考核内容"
+              v-model="form.itemContent"
+            ></el-input
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="title"> 牵头部门： </el-col>
+          <el-col :span="7">
+            <treeselect
+              v-model="form.leaderDept"
+              :flat="true"
+              :options="formatDep"
+              placeholder="请选择牵头部门"
+              :defaultExpandLevel="2"
+              :normalizer="
+                (d) => {
+                  return {
+                    id: d.id,
+                    label: d.name,
+                    children:
+                      d.children && d.children.length > 0
+                        ? d.children
+                        : undefined,
+                  };
+                }
+              "
+            />
+          </el-col>
+          <el-col :span="4" class="title"> 责任领导： </el-col>
+          <el-col :span="7">
+            <treeselect
+              v-model="form.leaderPrincipal"
+              :options="principalList"
+              placeholder="请选择牵头部门责任领导"
+              :defaultExpandLevel="1"
+              :normalizer="
+                (d) => {
+                  return {
+                    id: d.id,
+                    label: d.realname,
+                    children:
+                      d.children && d.children.length > 0
+                        ? d.children
+                        : undefined,
+                  };
+                }
+              "
+            />
+          </el-col>
+        </el-row>
+        <div class="leader">
+          <span class="el-icon-circle-plus-outline add"></span>
+          <el-row>
+            <el-col :span="4" class="title"> 其他牵头部门： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderDept"
+                :flat="true"
+                :options="formatDep"
+                placeholder="请选择其他牵头部门"
+                :defaultExpandLevel="2"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.name,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+            <el-col :span="4" class="title"> 责任领导： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderPrincipal"
+                :options="principalList"
+                placeholder="请选择其他牵头部门责任领导"
+                :defaultExpandLevel="1"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.realname,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div class="cooperate">
+          <span class="el-icon-circle-plus-outline add"></span>
+          <el-row>
+            <el-col :span="4" class="title">配合部门： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderDept"
+                :flat="true"
+                :options="formatDep"
+                placeholder="请选择配合部门"
+                :defaultExpandLevel="2"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.name,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+            <el-col :span="4" class="title"> 责任领导： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderPrincipal"
+                :options="principalList"
+                placeholder="请选择牵头部门责任领导"
+                :defaultExpandLevel="1"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.realname,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="title">分值：</el-col>
+            <el-col :span="7"><el-input placeholder="请输入分值" v-model="form.points"></el-input></el-col>
+          </el-row>
+        </div>
+        <div slot="footer">
+          <el-button type="primary" @click="save">确定</el-button>
+          <el-button @click="showEdit = false">取消</el-button>&nbsp;
+        </div>
+      </el-dialog>
   </div>
 </template>
 
@@ -359,4 +418,27 @@ export default {
 </script>
 
 <style scoped>
+  .el-row {
+    margin-bottom: 20px;
+    display: flex;
+    align-content: center;
+  }
+  .el-col {
+    text-align: right;
+  }
+  .title {
+    margin-right: 10px;
+    line-height: 36px;
+  }
+  .leader,
+  .cooperate {
+    position: relative;
+  }
+  .add {
+    font-size: 20px;
+    position: absolute;
+    right: 0px;
+    top: 8px;
+    color:#4d9efc;
+  }
 </style>

src/views/second/taskSummary/reward.vue

@@ -58,6 +58,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
+        <el-table-column label="第一牵头部门" width="120" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
         <el-table-column label="牵头部门" width="100" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
@@ -112,127 +122,176 @@
         :flat="true"
         @current-change="getDataList()"
       />
-    <el-dialog
-      title="编辑考核内容"
-      :visible.sync="showEdit"
-      width="400px"
-      custom-class="ele-dialog-form"
-      :lock-scroll="false"
-      :destroy-on-close="true"
-      @closed="form = {}"
-    >
-      <el-form
-        :model="form"
-        label-width="82px"
-        custom-class="editForm"
-        @keyup.enter.native="save"
-        @submit.native.prevent
-        ref="editForm"
+   <el-dialog
+        title="编辑考核内容"
+        :visible.sync="showEdit"
+        width="650px"
+        custom-class="ele-dialog-form"
+        :lock-scroll="false"
+        :destroy-on-close="true"
+        @closed="form = {}"
       >
-        <el-form-item label="小条内容：">
-          <el-input
-            type="textarea"
-            :rows="5"
-            placeholder="请输入考核内容"
-            v-model="form.itemContent"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="分值：">
-          <el-input placeholder="请输入分值" v-model="form.points"></el-input>
-        </el-form-item>
-
-        <el-form-item label="牵头部门：">
-          <treeselect
-           v-model="form.leaderDept"
-            :flat="true"
-            :options="formatDep"
-            :multiple="true"
-            placeholder="请选择牵头部门"
-            :defaultExpandLevel="2"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.name,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="责任领导：">
-           <treeselect
-            :multiple="true"
-            v-model="form.leaderPrincipal"
-            :options="principalList"
-            placeholder="请选择牵头部门责任领导"
-            :defaultExpandLevel="1"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.realname,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="配合部门：">
-          <treeselect
-            v-model="form.cooperateDept"
-            :flat="true"
-            :options="formatDep"
-            :multiple="true"
-            placeholder="请选择配合部门"
-            :defaultExpandLevel="2"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.name,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-        <el-form-item label="责任领导：">
-           <treeselect
-            :multiple="true"
-            v-model="form.cooperatePrincipal"
-            :options="principalList"
-            placeholder="请选择配合部门责任领导"
-            :defaultExpandLevel="1"
-            :normalizer="
-              (d) => {
-                return {
-                  id: d.id,
-                  label: d.realname,
-                  children:
-                    d.children && d.children.length > 0
-                      ? d.children
-                      : undefined,
-                };
-              }
-            "
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button @click="showEdit = false">取消</el-button>&nbsp;
-      </div>
-    </el-dialog>
+        <el-row>
+          <el-col :span="4" class="title">考核内容：</el-col>
+          <el-col :span="18"
+            ><el-input
+              type="textarea"
+              :rows="4"
+              placeholder="请输入考核内容"
+              v-model="form.itemContent"
+            ></el-input
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="title"> 牵头部门： </el-col>
+          <el-col :span="7">
+            <treeselect
+              v-model="form.leaderDept"
+              :flat="true"
+              :options="formatDep"
+              placeholder="请选择牵头部门"
+              :defaultExpandLevel="2"
+              :normalizer="
+                (d) => {
+                  return {
+                    id: d.id,
+                    label: d.name,
+                    children:
+                      d.children && d.children.length > 0
+                        ? d.children
+                        : undefined,
+                  };
+                }
+              "
+            />
+          </el-col>
+          <el-col :span="4" class="title"> 责任领导： </el-col>
+          <el-col :span="7">
+            <treeselect
+              v-model="form.leaderPrincipal"
+              :options="principalList"
+              placeholder="请选择牵头部门责任领导"
+              :defaultExpandLevel="1"
+              :normalizer="
+                (d) => {
+                  return {
+                    id: d.id,
+                    label: d.realname,
+                    children:
+                      d.children && d.children.length > 0
+                        ? d.children
+                        : undefined,
+                  };
+                }
+              "
+            />
+          </el-col>
+        </el-row>
+        <div class="leader">
+          <span class="el-icon-circle-plus-outline add"></span>
+          <el-row>
+            <el-col :span="4" class="title"> 其他牵头部门： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderDept"
+                :flat="true"
+                :options="formatDep"
+                placeholder="请选择其他牵头部门"
+                :defaultExpandLevel="2"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.name,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+            <el-col :span="4" class="title"> 责任领导： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderPrincipal"
+                :options="principalList"
+                placeholder="请选择其他牵头部门责任领导"
+                :defaultExpandLevel="1"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.realname,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div class="cooperate">
+          <span class="el-icon-circle-plus-outline add"></span>
+          <el-row>
+            <el-col :span="4" class="title">配合部门： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderDept"
+                :flat="true"
+                :options="formatDep"
+                placeholder="请选择配合部门"
+                :defaultExpandLevel="2"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.name,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+            <el-col :span="4" class="title"> 责任领导： </el-col>
+            <el-col :span="7">
+              <treeselect
+                v-model="form.leaderPrincipal"
+                :options="principalList"
+                placeholder="请选择牵头部门责任领导"
+                :defaultExpandLevel="1"
+                :normalizer="
+                  (d) => {
+                    return {
+                      id: d.id,
+                      label: d.realname,
+                      children:
+                        d.children && d.children.length > 0
+                          ? d.children
+                          : undefined,
+                    };
+                  }
+                "
+              />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="title">分值：</el-col>
+            <el-col :span="7"><el-input placeholder="请输入分值" v-model="form.points"></el-input></el-col>
+          </el-row>
+        </div>
+        <div slot="footer">
+          <el-button type="primary" @click="save">确定</el-button>
+          <el-button @click="showEdit = false">取消</el-button>&nbsp;
+        </div>
+      </el-dialog>
     </el-card>
   </div>
 </template>
@@ -366,4 +425,27 @@ export default {
 </script>
 
 <style scoped>
+  .el-row {
+    margin-bottom: 20px;
+    display: flex;
+    align-content: center;
+  }
+  .el-col {
+    text-align: right;
+  }
+  .title {
+    margin-right: 10px;
+    line-height: 36px;
+  }
+  .leader,
+  .cooperate {
+    position: relative;
+  }
+  .add {
+    font-size: 20px;
+    position: absolute;
+    right: 0px;
+    top: 8px;
+    color:#4d9efc;
+  }
 </style>