隐患

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

@@ -383,7 +383,11 @@ export default {
       })
     },
     handleSbSelect () {
-      this.$refs.sbInfoSelectModal.base({}, {})
+      const { form: { getFieldValue } } = this
+      const positionId = getFieldValue('positionId')
+      this.$refs.sbInfoSelectModal.base({}, {
+        positionId: positionId ? positionId[positionId.length - 1] : null
+      })
     },
     handleSbSelectd (keys, rows) {
       const [ key ] = keys

src/views/hidden/hidden/modules/RepairBaseForm.vue

@@ -16,7 +16,7 @@
       </a-form-item>
 
       <row-list :col="2">
-<!--        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="设备名称"
             :labelCol="BaseTool.Constant.labelCol"
@@ -103,7 +103,7 @@
             </a-tree-select>
           </a-form-item>
         </row-item>
-<!--        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="生产装置"
             :labelCol="BaseTool.Constant.labelCol"
@@ -155,7 +155,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="changePlanFlag" v-decorator="['category', {initialValue: 2, rules: [{required: true, message: '工单类别不能为空'}]}]" placeholder="请选择">
+            <a-select @change="changePlanFlag" v-decorator="['category', {initialValue: 1, rules: [{required: true, message: '工单类别不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in categoryMap"
                 :key="value"
@@ -462,7 +462,7 @@ export default {
       treeData: [],
       needStop: null,
       needStopMap: {},
-      category: 0,
+      category: 1,
       categoryMap: {},
       trustMap: {},
       statusMap: {},
@@ -576,15 +576,16 @@ export default {
           'limitHours',
           'source',
           'level',
-          'content',
           'status',
           'sbName',
           'needStop',
-          'category',
           'partName',
           'remark',
           'repairDeptId'
-        ])))
+        ]), {
+          content: `${record.existsQuestion}
+${record.hiddenRisk}`
+        }))
       })
     },
     getSbPositions (parentId) {

src/views/sb/info/modules/SbInfoSelectModal.vue

@@ -255,7 +255,7 @@ export default {
   },
   methods: {
     tableOption () {
-      //this.setTree()
+      // this.setTree()
       if (!this.optionAlertShow) {
         this.options = {
           alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
@@ -295,7 +295,7 @@ export default {
       }
     },
     handleOk () {
-      //this.setTree()
+      // this.setTree()
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {
@@ -313,7 +313,7 @@ export default {
     base (record, queryParam = {}) {
       this.visible = true
       this.modalTitle = '选择设备'
-      this.extraQueryParam = queryParam
+      this.queryParam = queryParam
       if (this.isCreated) {
         console.log(this.$refs.table)
         this.$refs.table.clearSelected()