调整

src/views/contingency/contingencyplan/index.vue

@@ -20,7 +20,7 @@
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
 			<!--<AttachFileButton  :app='app' ></AttachFileButton>-->
-      <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
+      <AttachFileShow :delButton='true' :addButton='true' :app='app'></AttachFileShow>
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->
@@ -77,7 +77,11 @@
 			tableTitle: [
         {label: "年度", prop: "year", fieldType: "int"},
         //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
-        {label: "季度", prop: "quarterName", fieldType: "ftString",width:80},
+        {label: "季度", prop: "quarter",formatter:function(row, column, value, index) {
+            let jdobj=['','第一季度','第二季度','第三季度','第四季度']
+            return jdobj[value]
+
+          },width:80},
 				{label: "演练名称", prop: "name", fieldType: "ftString",width:180},
 				{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
 				{label: "培训人数", prop: "pxrs", fieldType: "int"},

src/views/contingency/contingencystudy/edit.vue

@@ -9,16 +9,31 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="公司"  ref="gsid" prop="gsid">
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">
           <el-form-item label="演练单位"  ref="zzdw" prop="zzdw">
             <el-input :readonly="readonly"  v-model="form.zzdw" ></el-input>
           </el-form-item>
-        </el-col>
+        </el-col>-->
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="12">
+        <!--<el-col :span="12">
           <el-form-item label="培训人数"  ref="pxrs" prop="pxrs">
             <el-input :readonly="readonly"  v-model="form.pxrs" ></el-input>
           </el-form-item>
+        </el-col>-->
+        <!--<el-col :span="12">
+          <el-form-item label="演练单位"  ref="zzdw" prop="zzdw">
+            <el-input :readonly="readonly"  v-model="form.zzdw" ></el-input>
+          </el-form-item>
+        </el-col>-->
+        <el-col :span="12">
+          <el-form-item label="演练单位"  ref="yldwid" prop="yldwid">
+            <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="主(协)办单位"  ref="zbdw" prop="zbdw">
@@ -112,6 +127,8 @@
 
         /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
         form: {
+          gsid:'',
+          yldwid:'',
           //ID
           id:'',
           //演练名称

src/views/contingency/contingencystudy/index.vue

@@ -32,7 +32,7 @@
         <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
-        <WorkFlowButton  :app='this'></WorkFlowButton>
+       <!-- <WorkFlowButton  :app='this'></WorkFlowButton>-->
         <!-- 额外按钮-->
         <!-- 表头设置 -->
 
@@ -101,7 +101,11 @@
         tableTitle: [
           {label: "年度", prop: "year", fieldType: "int"},
           //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
-          {label: "季度", prop: "quarterName", fieldType: "ftString",width:80},
+          {label: "季度", prop: "quarter", formatter:function(row, column, value, index) {
+              let jdobj=['','第一季度','第二季度','第三季度','第四季度']
+              return jdobj[value]
+
+            },fieldType: "ftString",width:80},
           {label: "演练名称", prop: "name", fieldType: "ftString",width:180},
           {label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
           {label: "培训人数", prop: "pxrs", fieldType: "int"},

src/views/contingency/contingencystudy/reportEdit.vue

@@ -8,17 +8,22 @@
             <el-input :readonly="readonly"  v-model="form.name" ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司"  ref="gsid" prop="gsid">
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+          </el-form-item>
+        </el-col>
     <!--    <el-col :span="6">
           <el-form-item label="分公司ID"  ref="gsid" prop="gsid">
             <el-input :readonly="readonly"  v-model="form.gsid" ></el-input>
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
+       <!-- <el-col :span="12">
           <el-form-item label="演练组织单位"  ref="yldwid" prop="yldwid">
-          <!--  <el-input :readonly="readonly"  v-model="form.yldwid" ></el-input> -->
+          &lt;!&ndash;  <el-input :readonly="readonly"  v-model="form.yldwid" ></el-input> &ndash;&gt;
           <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
           </el-form-item>
-        </el-col>
+        </el-col>-->
 
 
         <!--<el-col :span="6">-->
@@ -28,10 +33,15 @@
         <!--</el-col>-->
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!--<el-col :span="12">
           <el-form-item label="培训人数"  ref="pxrs" prop="pxrs">
             <el-input type="number" :readonly="readonly"  v-model="form.pxrs" ></el-input>
           </el-form-item>
+        </el-col>-->
+        <el-col :span="12">
+          <el-form-item label="演练组织部门"  ref="yldwid" prop="yldwid">
+            <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="演练目标"  ref="ylmb" prop="ylmb">
@@ -128,7 +138,7 @@
           //演练名称
           name:'',
           //分公司ID
-          // gsid:'',
+          gsid:'',
           //演练组织单位ID
           yldwid:'',
           //演练计划ID