merge fix

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

@@ -119,46 +119,54 @@
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否入库" style='flex:1'>
-            <el-select v-model='form.is_storage' placeholder='是否入库'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width '>
+              <el-select v-model='form.is_storage' placeholder='是否入库' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
           <el-form-item label="是否开工" style='flex:1' class='ml-20'>
-            <el-select v-model='form.is_actual_commencement' placeholder='是否开工'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.is_start' placeholder='是否开工' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否纳入省重点项目" style='flex:1'>
-            <el-select v-model='form.is_provincial_key' placeholder='是否纳入省重点项目'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.is_provincial_key' placeholder='是否纳入省重点项目' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
           <el-form-item label="是否纳入省集中开工项目" style='flex:1' class='ml-20'>
-            <el-select v-model='form.is_provincial_level_construction' placeholder='是否纳入省集中开工项目'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.is_provincial_level_construction' placeholder='是否纳入省集中开工项目' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
         </div>
         <div class='full-width  '>

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

@@ -41,37 +41,43 @@
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否民间投资项目" style='flex:1'>
-            <el-select v-model='form.social_investment' placeholder='是否民间投资项目'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.social_investment' placeholder='是否民间投资项目' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
           <el-form-item label="是否产业项目" style='flex:1' class='ml-20'>
-            <el-select v-model='form.industrial_investment' placeholder='是否产业项目'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.industrial_investment' placeholder='是否产业项目' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
         </div>
 
         <div class='full-width  flex'>
           <el-form-item label="是否获得资金支持项目" style='flex:1'>
-            <el-select v-model='form.funds_supper' placeholder='是否获得资金支持项目'>
-              <el-option
-                  v-for="item in yesOrNo"
-                  :key='item.label'
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
+            <div class='full-width'>
+              <el-select v-model='form.funds_supper' placeholder='是否获得资金支持项目' class='full-width'>
+                <el-option
+                    v-for="item in yesOrNo"
+                    :key='item.label'
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </div>
           </el-form-item>
           <div style='flex:1' class='ml-20'></div>
         </div>