merge fix

src/views/home/component/dash.vue

@@ -446,6 +446,7 @@ export default {
         document.body.appendChild(link)
         link.click()
         link.remove()
+        this.diaType = -1
       })
     }
   }

src/views/home/component/form_dialog.vue

@@ -179,7 +179,7 @@ export default {
             this.fieldType[index].params = res.data.records.map(e => {
               e.checked = true
               return e
-            })
+            }).filter(sub => sub.code !== 'name')
             this.fieldType[index].count = res.data.total
           }
         })
@@ -202,7 +202,7 @@ export default {
       const tmpsList = tmps.filter(sub => sub.checked)
       if (tmpsList && tmpsList.length > 0) {
         const result = tmpsList.map(sub => sub.code).join(',')
-        this.$emit('export', result)
+        this.$emit('export', 'name,' + result)
       } else {
         this.$message.error('未选择任何字段进行导出')
       }

src/views/home/component/params/params1.vue

@@ -2,7 +2,10 @@
   <div class='flex flex-justify-start flex-align-center flex-col'>
     <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
       <span class='full-width text-left bold'>{{ info.dictValue }}</span>
-      <el-button v-if='detail.canUpdate'  type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑' : '保 存' }}</el-button>
+      <el-button v-if='detail.canUpdate' type='primary' @click='disabled = !disabled'>{{
+          disabled ? '编 辑' : '保 存'
+        }}
+      </el-button>
     </div>
     <div class='mt-10' style='width: 80%;'>
       <el-form
@@ -15,85 +18,150 @@
       >
         <div class='flex flex-justify-start '>
           <el-form-item label="项目名称" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.name" placeholder='项目名称'/>
           </el-form-item>
           <el-form-item label="总投资金额（万元）" style='flex:1' class='ml-20'>
-            <el-input v-model="form.totalAmount"/>
+            <el-input v-model="form.totalAmount" placeholder='总投资金额（万元）'/>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="县（区）" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.name" placeholder='县（区）'/>
           </el-form-item>
           <el-form-item label="责任单位" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.region" placeholder='责任单位'/>
           </el-form-item>
         </div>
 
         <div class='full-width  flex'>
           <el-form-item label="主管单位" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.name" placeholder='主管单位'/>
           </el-form-item>
           <el-form-item label="责任领导" style='flex:1' class='ml-20'>
-            <el-input v-model="form.responsibleLeader"/>
+            <el-input v-model="form.responsibleLeader" placeholder='责任领导'/>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="项目负责人" style='flex:1'>
-            <el-input v-model="form.projectLeader"/>
+            <el-input v-model="form.projectLeader" placeholder='项目负责人'/>
           </el-form-item>
           <el-form-item label="联系电话" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.region" placeholder='联系电话'/>
           </el-form-item>
         </div>
 
         <div class='full-width  flex'>
-          <el-form-item label="行业分类" style='flex:1'>
+          <el-form-item label="行业分类" class='flex-child-average' style='flex:1'>
             <el-input v-model="form.name"/>
           </el-form-item>
-          <el-form-item label="建设起至时间" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+          <el-form-item label="建设起止时间" class='flex-child-average ml-20'>
+            <el-date-picker
+                v-model="form.date"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="截止日期"
+                style='width: 100%;'
+            />
           </el-form-item>
         </div>
 
         <div class='full-width  flex'>
-          <el-form-item label="计划开工时间" style='flex:1'>
-            <el-input v-model="form.planCommencementTime"/>
+          <el-form-item label="计划开工时间" style='flex:1' class='full-width'>
+            <el-date-picker
+                v-model="form.planCommencementTime"
+                type="date"
+                style="width:100%;"
+                placeholder="计划开工时间"
+            />
           </el-form-item>
           <el-form-item label="实际开工时间" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-date-picker
+                v-model="form.planCommencementTime"
+                type="date"
+                style="width:100%;"
+                placeholder="实际开工时间"
+            />
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="计划入库时间" style='flex:1'>
-            <el-input v-model="form.planStorageTime"/>
+            <el-date-picker
+                v-model="form.planStorageTime"
+                type="date"
+                style="width:100%;"
+                placeholder="计划入库时间"
+            />
           </el-form-item>
           <el-form-item label="实际入库时间" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-date-picker
+                v-model="form.planStorageTime"
+                type="date"
+                style="width:100%;"
+                placeholder="实际入库时间"
+            />
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="计划竣工时间" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-date-picker
+                v-model="form.planStorageTime"
+                type="date"
+                style="width:100%;"
+                placeholder="计划竣工时间"
+            />
           </el-form-item>
           <el-form-item label="实际竣工时间" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-date-picker
+                v-model="form.planStorageTime"
+                type="date"
+                style="width:100%;"
+                placeholder="实际竣工时间"
+            />
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否入库" style='flex:1'>
-            <el-input v-model="form.isStorage"/>
+            <el-select v-model='form.isStorage' placeholder='是否入库'>
+              <el-option
+                  v-for="item in yesOrNo"
+                  :key='item.label'
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="是否开工" style='flex:1' class='ml-20'>
-            <el-input v-model="form.isActualCommencement"/>
+            <el-select v-model='form.isActualCommencement' placeholder='是否开工'>
+              <el-option
+                  v-for="item in yesOrNo"
+                  :key='item.label'
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否纳入省重点项目" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-select v-model='form.isActualCommencement' placeholder='是否纳入省重点项目'>
+              <el-option
+                  v-for="item in yesOrNo"
+                  :key='item.label'
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="是否纳入省集中开工项目" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-select v-model='form.isActualCommencement' placeholder='是否纳入省集中开工项目'>
+              <el-option
+                  v-for="item in yesOrNo"
+                  :key='item.label'
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </div>
         <div class='full-width  '>
@@ -143,7 +211,11 @@ export default {
   data () {
     return {
       disabled: true,
-      form: {}
+      form: {},
+      yesOrNo: [
+        { label: '否', value: 0 },
+        { label: '是', value: 1 }
+      ]
     }
   },
   methods: {