Merge branch 'V0.0.6' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6

src/views/core/drill/task/index.vue

@@ -144,9 +144,22 @@
             <el-table-column
               label="任务名称"
               align="center"
+              width="310"
               prop="title"
             />
             <el-table-column
+              label="地区"
+              width="100"
+              align="center"
+              prop="affiliatedArea"
+            />
+            <el-table-column
+              label="行社名称"
+              width="200"
+              align="center"
+              prop="affiliatedBank"
+            />
+            <el-table-column
               label="演练机构"
               width="200"
               align="center"

src/views/core/edu/task/index.vue

@@ -167,9 +167,22 @@
             <el-table-column
               label="任务名称"
               align="center"
+              width="315"
               prop="title"
             />
             <el-table-column
+              label="地区"
+              width="115"
+              align="center"
+              prop="affiliatedArea"
+            />
+            <el-table-column
+              label="行社名称"
+              width="315"
+              align="center"
+              prop="affiliatedBank"
+            />
+            <el-table-column
               label="受训机构"
               width="315"
               align="center"

src/views/core/outIn/outInLog/index.vue

@@ -149,9 +149,24 @@
               label="来访事由"
               align="center"
               :show-overflow-tooltip="true"
+              width="250"
               prop="reasons"
             />
             <el-table-column
+              label="地区"
+              align="center"
+              prop="affiliatedArea"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
+              label="行社名称"
+              align="center"
+              prop="affiliatedBank"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
               label="接待机构"
               align="center"
               prop="orgName"

src/views/core/task/index.vue

@@ -148,6 +148,18 @@
               show-overflow-tooltip="true"
             />
             <el-table-column
+              label="地区"
+              align="center"
+              prop="affiliatedArea"
+              width="220"
+            />
+            <el-table-column
+              label="行社名称"
+              align="center"
+              prop="affiliatedBank"
+              width="220"
+            />
+            <el-table-column
               label="调阅机构"
               align="center"
               prop="orgName"

src/views/question/list/index.vue

@@ -139,6 +139,22 @@
             </el-table-column>
             <el-table-column
               align="center"
+              label="地区"
+              prop="affiliatedArea"
+              show-overflow-tooltip
+              min-width="80"
+              v-if="columns[6].visible"
+            />
+            <el-table-column
+              align="center"
+              label="行社名称"
+              prop="affiliatedBank"
+              show-overflow-tooltip
+              min-width="120"
+              v-if="columns[7].visible"
+            />
+            <el-table-column
+              align="center"
               label="机构名称"
               prop="orgName"
               show-overflow-tooltip
@@ -154,6 +170,7 @@
             <el-table-column
               align="center"
               label="标准依据"
+              min-width="200"
               prop="checkContent"
               v-if="columns[3].visible"
             >
@@ -164,6 +181,7 @@
             <el-table-column
               align="center"
               label="隐患描述"
+              min-width="200"
               prop="questionDesc"
               show-overflow-tooltip
               v-if="columns[4].visible"

src/views/question/reform/index.vue

@@ -123,6 +123,22 @@
             </el-table-column>
             <el-table-column
               align="center"
+              label="地区"
+              prop="affiliatedArea"
+              show-overflow-tooltip
+              min-width="80"
+              v-if="columns[6].visible"
+            />
+            <el-table-column
+              align="center"
+              label="行社名称"
+              prop="affiliatedBank"
+              show-overflow-tooltip
+              min-width="120"
+              v-if="columns[7].visible"
+            />
+            <el-table-column
+              align="center"
               label="机构名称"
               prop="orgName"
               show-overflow-tooltip
@@ -132,6 +148,7 @@
               align="center"
               label="标准依据"
               prop="checkContent"
+              min-width="150"
               v-if="columns[2].visible"
             >
               <template slot-scope="scope">
@@ -267,6 +284,8 @@ export default {
         { key: 3, label: `隐患描述`, visible: true },
         { key: 4, label: `整改期限`, visible: true },
         { key: 5, label: `整改状态`, visible: true },
+        { key: 6, label: `地区`, visible: true },
+        { key: 7, label: `行社名称`, visible: true },
       ],
     };
   },

src/views/resumption/protection/index.vue

@@ -134,6 +134,18 @@
             </el-table-column>
             <el-table-column
               align="center"
+              prop="affiliatedArea"
+              label="地区"
+              v-if="columns[6].visible"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              prop="affiliatedBank"
+              label="行社名称"
+              v-if="columns[7].visible"
+            ></el-table-column>
+            <el-table-column
+              align="center"
               prop="orgName"
               label="所属机构"
               v-if="columns[1].visible"
@@ -302,6 +314,8 @@ export default {
         { key: 3, label: `报警控制器状态`, visible: true },
         { key: 4, label: `登记人`, visible: true },
         { key: 5, label: `最近登记时间`, visible: true },
+        { key: 6, label: `地区`, visible: true },
+        { key: 7, label: `行社名称`, visible: true },
       ],
     };
   },

src/views/resumption/taskManager/index.vue

@@ -165,6 +165,22 @@
             </el-table-column>
             <el-table-column
               align="center"
+              prop="affiliatedArea"
+              label="地区"
+              min-width="90"
+              v-if="columns[2].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="affiliatedBank"
+              label="行社名称"
+              min-width="120"
+              v-if="columns[2].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
               prop="orgName"
               label="履职机构"
               min-width="120"
@@ -328,6 +344,8 @@ export default {
         { key: 4, label: `任务进度`, visible: true },
         { key: 5, label: `任务时间`, visible: true },
         { key: 6, label: `隐患问题数`, visible: true },
+        { key: 7, label: `地区`, visible: true },
+        { key: 8, label: `行社名称`, visible: true },
       ],
     };
   },
@@ -530,4 +548,4 @@ export default {
 .el-form--inline .el-form-item {
   display: inline-flex;
 }
-</style>
+</style>

src/views/safetycheck/task/index.vue

@@ -289,6 +289,24 @@
             >
             </el-table-column> -->
             <el-table-column
+              prop="affiliatedArea"
+              label="地区"
+              align="center"
+              width="150px"
+              show-overflow-tooltip
+              v-if="columns[8].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="affiliatedBank"
+              label="行社名称"
+              align="center"
+              width="200px"
+              show-overflow-tooltip
+              v-if="columns[9].visible"
+            >
+            </el-table-column>
+            <el-table-column
               prop="orgName"
               label="受检机构"
               align="center"
@@ -490,6 +508,8 @@ export default {
         { key: 5, label: `受检机构`, visible: true },
         { key: 6, label: `任务时间`, visible: true },
         { key: 7, label: `隐患问题数`, visible: true },
+        { key: 8, label: `地区`, visible: true },
+        { key: 9, label: `行社名称`, visible: true },
       ],
     };
   },