Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/eam/inspectionItemSelectSet/inspectionItemSelectSet.data.ts

@@ -14,7 +14,7 @@ export const InspectionItemSelectSet = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isSearch: false,
-    isTable: false,
+    isTable: true,
     isForm: false,
     isDetail:false,
   },

src/views/eam/maintenance/audiForm.vue

@@ -2,26 +2,9 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核人" prop="approver">
-            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="审核内容" prop="approveContent">
-            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核时间" prop="approveTime">
-            <el-date-picker
-              v-model="formData.approveTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择审核时间">
-            </el-date-picker>
+            <el-input type="textarea" :input-style="{height:'200px'}" maxlength="300" v-model="formData.approveContent" placeholder="请输入审核内容" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/eam/maintenanceItemSelectSet/maintenanceItemSelectSet.data.ts

@@ -14,7 +14,7 @@ export const BasicMaintenanceItemSelectSet = useCrudSchemas(reactive<CrudSchema[
     field: 'id',
     sort: 'custom',
     isSearch: false,
-    isTable: false,
+    isTable: true,
     isForm: false,
     isDetail:false,
   },

src/views/eam/planInspection/audiForm.vue

@@ -2,26 +2,9 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核人" prop="approver">
-            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="审核内容" prop="approveContent">
-            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核时间" prop="approveTime">
-            <el-date-picker
-              v-model="formData.approveTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择审核时间">
-            </el-date-picker>
+            <el-input type="textarea" :input-style="{height:'200px'}" maxlength="300" v-model="formData.approveContent" placeholder="请输入审核内容" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/eam/planSpotCheck/audiForm.vue

@@ -2,26 +2,9 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核人" prop="approver">
-            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="审核内容" prop="approveContent">
-            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核时间" prop="approveTime">
-            <el-date-picker
-              v-model="formData.approveTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择审核时间">
-            </el-date-picker>
+            <el-input type="textarea" :input-style="{height:'200px'}" maxlength="300" v-model="formData.approveContent" placeholder="请输入审核内容" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -31,7 +14,6 @@
       <el-button @click="handleClose('close')">取 消</el-button>
     </template>
   </Dialog>
-
 <!--添加巡检项弹窗-->
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 

src/views/eam/spotCheckSelectSet/spotCheckSelectSet.data.ts

@@ -14,7 +14,7 @@ export const BasicSpotCheckSelectSet = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isSearch: false,
-    isTable: false,
+    isTable: true,
     isForm: false,
     isDetail:false,
   },