隐患优化

src/views/hidden/hidden/HiddenDanger.vue

@@ -68,7 +68,7 @@
           <template>
             <a @click="handleView(record)">查看</a>
             <operation-button
-              v-if="$auth('hidden-hiddens-edit')"
+              v-if="$auth('hidden-dangers-edit')"
               @click="handleRepair(record)"
             >转维修</operation-button>
             <operation-button
@@ -124,9 +124,9 @@ export default {
           }
         },
         {
-          title: '设备',
+          title: '检查区域',
           width: '150px',
-          dataIndex: 'sbId'
+          dataIndex: 'positionName'
         },
         {
           title: '设备位号',
@@ -134,9 +134,9 @@ export default {
           dataIndex: 'positionNo'
         },
         {
-          title: '检查区域',
+          title: '设备',
           width: '150px',
-          dataIndex: 'positionId'
+          dataIndex: 'sbName'
         },
         {
           title: '存在问题',
@@ -156,12 +156,12 @@ export default {
         {
           title: '整改责任人',
           width: '150px',
-          dataIndex: 'dutyUser'
+          dataIndex: 'dutyUserName'
         },
         {
           title: '属地负责人',
           width: '150px',
-          dataIndex: 'areaUser'
+          dataIndex: 'areaUserName'
         },
         {
           title: '备注',

src/views/hidden/hidden/modules/BaseForm.vue

@@ -161,7 +161,7 @@
             <a-date-picker
               showTime
               style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
               v-decorator="['requireTime', {rules: [{required: true, message: '整改时限不能为空'}]}]" />
           </a-form-item>
         </row-item>
@@ -325,7 +325,8 @@ export default {
         // 日期处理
         values.fileList = this.fileList
         values.beforeImageList = this.beforeImageList
-        values.requireTime = this.BaseTool.Date.formatter(values.requireTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        values.requireTime = this.BaseTool.Date.formatter(values.requireTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        values.positionId = values.positionId[1]
         console.log(values)
         if (this.BaseTool.String.isBlank(values.id)) {
           addHiddenDanger(values)
@@ -374,7 +375,7 @@ export default {
         targetOption.children = res.data.map(item => {
           item = {
             label: item.name,
-            value: item.name
+            value: item.id
           }
           return item
         })