调整

src/views/contingency/contingencystudy/report.vue

@@ -91,14 +91,7 @@
         {label: "演练组织单位", prop: "yldwName", fieldType: "ftString",width:192},
         // {label: "演练计划", prop: "yljhName", fieldType: "ftString",width:192},
         /*{label: "培训人数", prop: "pxrs", fieldType: "int"},*/
-        {label: "演练目标", prop: "ylmb", fieldType: "ftString",width:300},
-        {label: "演练方式", prop: "ylfs", fieldType: "ftString",width:160},
-        {label: "演练时间", prop: "ylrq", fieldType: "ftDateTime"},
-        {label: "演练责任人", prop: "ylzrrName", fieldType: "ftString",width:192},
-        /*{label: "演练时长", prop: "ylsc", fieldType: "float"},*/
-        {label: "主(协)办单位", prop: "zbdwid", fieldType: "ftString",width:192},
-        // {label: "演练负责人", prop: "ylfzrName", fieldType: "ftString",width:192},
-        // {label: "质量负责人", prop: "zlfzrName", fieldType: "ftString",width:192},
+        {label: "演练地点", prop: "ylmb", fieldType: "ftString",width:300},
        {
          label: "演练等级",
          prop: "yldj",
@@ -109,7 +102,14 @@
            value: 'id'
          }
        },
-        {label: "估计费用", prop: "gjfy", fieldType: "float"},
+        {label: "演练时间", prop: "ylrq", fieldType: "ftDateTime"},
+        {label: "演练责任人", prop: "ylzrrName", fieldType: "ftString",width:192},
+        /*{label: "演练时长", prop: "ylsc", fieldType: "float"},*/
+        {label: "协办单位", prop: "zbdwid", fieldType: "ftString",width:192},
+        // {label: "演练负责人", prop: "ylfzrName", fieldType: "ftString",width:192},
+        // {label: "质量负责人", prop: "zlfzrName", fieldType: "ftString",width:192},
+
+        {label: "演练人数", prop: "gjfy",width:120},
         {label: "备注", prop: "bz", fieldType: "ftString",width:300},
         {label: "维护人", prop: "whr", fieldType: "ftString"},
         {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}

src/views/contingency/contingencystudy/reportEdit.vue

@@ -44,18 +44,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="演练目标"  ref="ylmb" prop="ylmb">
+          <el-form-item label="演练地点"  ref="ylmb" prop="ylmb">
             <el-input :readonly="readonly"  v-model="form.ylmb" ></el-input>
           </el-form-item>
         </el-col>
        <el-col :span="12">
-          <el-form-item label="演练方式"  ref="ylfs" prop="ylfs">
-            <el-input :readonly="readonly"  v-model="form.ylfs" ></el-input>
+           <el-form-item label="演练等级"  ref="yldj" prop="yldj">
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.yldj' ></RelSelect>
            </el-form-item>
        </el-col>
         <el-col :span="12">
           <el-form-item label="演练时间"  ref="ylrq" prop="ylrq">
-            <el-date-picker  style="width: 100%;" :readonly="readonly" type="date"
+            <el-date-picker  style="width: 100%;" :readonly="readonly" type="datetime"
                              v-model="form.ylrq"  placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -74,21 +74,17 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="12">
-          <el-form-item label="主(协)办单位"  ref="zbdwid" prop="zbdwid">
+          <el-form-item label="协办单位"  ref="zbdwid" prop="zbdwid">
             <el-input :readonly="readonly"  v-model="form.zbdwid" ></el-input>
           </el-form-item>
         </el-col>
 
       </el-row>
       <el-row :gutter="20">
+
         <el-col :span="12">
-            <el-form-item label="演练等级"  ref="yldj" prop="yldj">
-             <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.yldj' ></RelSelect>
-            </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="估计费用(元)"  ref="gjfy" prop="gjfy">
-            <el-input type='number' :readonly="readonly"  v-model="form.gjfy" ></el-input>
+          <el-form-item label="演练人数"  ref="gjfy" prop="gjfy">
+            <el-input  :readonly="readonly"  v-model="form.gjfy" ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">