完善

src/utils/dict.js

@@ -536,6 +536,10 @@ DictCache.VALUE = {
     IS_PARENT: '2', // 父类
     IS_NORMAL: '3' // 普通设备
   },
+  SB_IS_SHOW: {
+    NOT_SHOW: '0', // 不显示
+    IS_SHOWING: '1' // 显示
+  },
   /**
    * 设备状态
    */
@@ -801,7 +805,7 @@ DictCache.VALUE = {
    */
   CHECK_STANDARD_TYPE: {
     SPOT: 1, // 点检
-    POLLING: 2 // 巡检
+    POLLING: 2 // 保养
   },
   /**
    * 计划周期类型

src/views/check/checkstandard/modules/BaseForm.vue

@@ -138,26 +138,17 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="排序"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              :step="1"
-              v-decorator="['sort', {initialValue: 1,rules: [{required: true, message: '排序不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <!--        <row-item>
-          <a-form-item
-            label="动作类型"
+            label="类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-select
-              v-decorator="['actionType', {initialValue: 1,rules: [{required: true, message: '是否启用不能为空'}]}]"
+              disabled
+              v-show="false"
+              v-decorator="['type', {initialValue:checkType,rules: [{required: true, message: '检查类型不能为空'}]}]"
               placeholder="请选择">
               <a-select-option
-                v-for="(label,value) in actionTypeMap"
+                v-for="(label,value) in typeMap"
                 :key="value"
                 :label="label"
                 :value="parseInt(value)">{{ label }}
@@ -167,17 +158,26 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="检查类型"
+            label="排序"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              :step="1"
+              v-decorator="['sort', {initialValue: 1,rules: [{required: true, message: '排序不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <!--        <row-item>
+          <a-form-item
+            label="动作类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-select
-              disabled
-              v-show="false"
-              v-decorator="['type', {initialValue:checkType,rules: [{required: true, message: '检查类型不能为空'}]}]"
+              v-decorator="['actionType', {initialValue: 1,rules: [{required: true, message: '是否启用不能为空'}]}]"
               placeholder="请选择">
               <a-select-option
-                v-for="(label,value) in typeMap"
+                v-for="(label,value) in actionTypeMap"
                 :key="value"
                 :label="label"
                 :value="parseInt(value)">{{ label }}
@@ -185,6 +185,7 @@
             </a-select>
           </a-form-item>
         </row-item>
+
         <row-item>
           <a-form-item
             v-show="false"
@@ -405,7 +406,7 @@ export default {
      */
     checkType: {
       type: Number,
-      default: 1
+      default: 2
     }
   },
   created () {
@@ -418,7 +419,7 @@ export default {
     this.checkUserTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_USER_TYPE)
   },
   methods: {
-    base (record, sbId) {
+    base (record, sbId, sbNo) {
       this.visible = true
       this.selectedRowKeys = []
       this.selectedRows = []
@@ -436,7 +437,7 @@ export default {
           const { form: { setFieldsValue } } = this
           // 日期处理
           this.$nextTick(() => {
-            setFieldsValue({ sbId: sbId })
+            setFieldsValue({ sbId: sbId, sbNo: sbNo })
           })
         }
         return

src/views/check/checkstandard/modules/DetailSbCheck.vue

@@ -186,7 +186,7 @@ export default {
     },
     handleAdd () {
       const modal = this.$refs.baseModal
-      modal.base(null, this.model.id)
+      modal.base(null, this.model.id, this.model.no)
     },
     handleView (record) {
       fetchCheckStandard({ id: record.id }).then(res => {

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

@@ -256,7 +256,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="isShow=!isShow" v-decorator="['isChild', {initialValue:0, rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
+            <a-select @change="isShow=!isShow" v-decorator="['isShow', {initialValue:0, rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in isShowMap"
                 :key="value"