添加字段

src/views/main/scrhidedata/addForm.vue

@@ -41,6 +41,15 @@
         >
           <a-input-number placeholder="请输入未整改" style="width: 100%" v-decorator="['wzg', {rules: [{required: true, message: '请输入未整改！'}]}]" />
         </a-form-item>
+        <a-form-item
+          label="施工地点"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择施工地点" v-decorator="['workPlace', {rules: [{ required: true, message: '请选择施工地点！' }]}]">
+            <a-select-option v-for="(item,index) in workPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -62,7 +71,8 @@
         },
         visible: false,
         confirmLoading: false,
-        form: this.$form.createForm(this)
+        form: this.$form.createForm(this),
+        workPlaceData: []
       }
     },
     methods: {
@@ -70,6 +80,8 @@
       // 初始化方法
       add (record) {
         this.visible = true
+        const workPlaceOption = this.$options
+        this.workPlaceData = workPlaceOption.filters['dictData']('work_place')
       },
       /**
        * 提交表单

src/views/main/scrhidedata/editForm.vue

@@ -42,6 +42,15 @@
         >
           <a-input-number placeholder="请输入未整改" style="width: 100%" v-decorator="['wzg', {rules: [{required: true, message: '请输入未整改！'}]}]" />
         </a-form-item>
+        <a-form-item
+          label="施工地点"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择施工地点" v-decorator="['workPlace', {rules: [{ required: true, message: '请选择施工地点！' }]}]">
+            <a-select-option v-for="(item,index) in workPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -63,7 +72,8 @@
         },
         visible: false,
         confirmLoading: false,
-        form: this.$form.createForm(this)
+        form: this.$form.createForm(this),
+        workPlaceData: []
       }
     },
     methods: {
@@ -71,13 +81,16 @@
       // 初始化方法
       edit (record) {
         this.visible = true
+        const workPlaceOption = this.$options
+        this.workPlaceData = workPlaceOption.filters['dictData']('work_place')
         setTimeout(() => {
           this.form.setFieldsValue(
             {
               id: record.id,
               yhsl: record.yhsl,
               yzg: record.yzg,
-              wzg: record.wzg
+              wzg: record.wzg,
+              workPlace: record.workPlace
             }
           )
         }, 100)

src/views/main/scrhidedata/index.vue

@@ -90,6 +90,11 @@
             title: '未整改',
             align: 'center',
             dataIndex: 'wzg'
+          },
+          {
+            title: '施工地点',
+            align: 'center',
+            dataIndex: 'workPlace'
           }
         ],
         tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },

src/views/main/scrworktask/addForm.vue

@@ -34,6 +34,24 @@
         >
           <a-input-number placeholder="请输入数量" style="width: 100%" v-decorator="['totalNum', {rules: [{required: true, message: '请输入数量！'}]}]" />
         </a-form-item>
+        <a-form-item
+          label="施工地点"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择施工地点" v-decorator="['workPlace', {rules: [{ required: true, message: '请选择施工地点！' }]}]">
+            <a-select-option v-for="(item,index) in workPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item
+          label="级别"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择级别" v-decorator="['level', {rules: [{ required: true, message: '请选择级别！' }]}]">
+            <a-select-option v-for="(item,index) in levelData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -56,7 +74,9 @@
         nameData: [],
         visible: false,
         confirmLoading: false,
-        form: this.$form.createForm(this)
+        form: this.$form.createForm(this),
+        workPlaceData: [],
+        levelData: []
       }
     },
     methods: {
@@ -66,6 +86,10 @@
         this.visible = true
         const nameOption = this.$options
         this.nameData = nameOption.filters['dictData']('work_task_type')
+        const workPlaceOption = this.$options
+        this.workPlaceData = workPlaceOption.filters['dictData']('work_place')
+        const levelOption = this.$options
+        this.levelData = levelOption.filters['dictData']('work_level')
       },
       /**
        * 提交表单

src/views/main/scrworktask/editForm.vue

@@ -35,6 +35,24 @@
         >
           <a-input-number placeholder="请输入数量" style="width: 100%" v-decorator="['totalNum', {rules: [{required: true, message: '请输入数量！'}]}]" />
         </a-form-item>
+        <a-form-item
+          label="施工地点"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择施工地点" v-decorator="['workPlace', {rules: [{ required: true, message: '请选择施工地点！' }]}]">
+            <a-select-option v-for="(item,index) in workPlaceData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item
+          label="级别"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+        >
+          <a-select style="width: 100%" placeholder="请选择级别" v-decorator="['level', {rules: [{ required: true, message: '请选择级别！' }]}]">
+            <a-select-option v-for="(item,index) in levelData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -57,7 +75,9 @@
         nameData: [],
         visible: false,
         confirmLoading: false,
-        form: this.$form.createForm(this)
+        form: this.$form.createForm(this),
+        workPlaceData: [],
+        levelData: []
       }
     },
     methods: {
@@ -67,12 +87,18 @@
         this.visible = true
         const nameOption = this.$options
         this.nameData = nameOption.filters['dictData']('work_task_type')
+        const workPlaceOption = this.$options
+        this.workPlaceData = workPlaceOption.filters['dictData']('work_place')
+        const levelOption = this.$options
+        this.levelData = levelOption.filters['dictData']('work_level')
         setTimeout(() => {
           this.form.setFieldsValue(
             {
               id: record.id,
               name: record.name,
-              totalNum: record.totalNum
+              totalNum: record.totalNum,
+              workPlace: record.workPlace,
+              level: record.level
             }
           )
         }, 100)

src/views/main/scrworktask/index.vue

@@ -12,9 +12,9 @@
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-                <a-form-item label="月份">
+              <a-form-item label="月份">
-                  <a-month-picker style="width: 100%" placeholder="请选择月份" v-model="queryParam.happenTimeDate" @change="onChangehappenTime"/>
+                 <a-month-picker style="width: 100%" placeholder="请选择月份" v-model="queryParam.happenTimeDate" @change="onChangehappenTime"/>
-                </a-form-item>
+              </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24" >
               <span class="table-page-search-submitButtons">
@@ -98,6 +98,16 @@
             title: '数量',
             align: 'center',
             dataIndex: 'totalNum'
+          },
+          {
+            title: '施工地点',
+            align: 'center',
+            dataIndex: 'workPlace'
+          },
+          {
+            title: '级别',
+            align: 'center',
+            dataIndex: 'level'
           }
         ],
         tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },