qymljy 2 years ago
parent
commit
79a5f9dcce
3 changed files with 79 additions and 248 deletions
  1. 20 120
      src/Form/projectChange/add.vue
  2. 14 115
      src/Form/projectChange/edit.vue
  3. 45 13
      src/HDrpManagement/projectChange/index.vue

+ 20 - 120
src/Form/projectChange/add.vue

@@ -10,18 +10,18 @@
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" label-width="130px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="项目名称" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+<!--            <el-col :span="12">
               <el-form-item label="项目编号" prop="projectnum">
                 <el-input v-model="form.projectnum" placeholder="请输入项目编号"></el-input>
               </el-form-item>
-            </el-col>
-            <el-col :span="12">
+            </el-col>-->
+<!--            <el-col :span="12">
               <el-form-item label="当前项目模板" prop="sa_projstagetempid">
                 <el-select v-model="form.sa_projstagetempid" placeholder="请选择当前项目模板" size="mini">
                   <el-option
@@ -32,9 +32,9 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="12">
-              <el-form-item label="项目类型" prop="projecttype">
+              <el-form-item label="项目类型:" prop="projecttype">
                 <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                   <el-option
                       v-for="(item,index) in projectType()"
@@ -46,23 +46,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目预算" prop="budgetary">
+              <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="项目规模" prop="scale">
+              <el-form-item label="项目规模:" prop="scale">
                 <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="预计签约金额" prop="signamount_due">
+              <el-form-item label="预计签约金额(元):" prop="signamount_due">
                 <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目等级" prop="grade">
+              <el-form-item label="项目等级:" prop="grade">
                 <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                   <el-option
                       v-for="item in projectLead()"
@@ -74,7 +74,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目地址" prop="province">
+              <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width:100%"
                     v-model="value"
@@ -85,16 +85,17 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="详细地址" prop="address">
+              <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="预计签约时间" prop="signdate_due">
+              <el-form-item label="预计签约月份:" prop="signdate_due">
                 <el-date-picker
+                    style="width: 100%"
                     v-model="form.signdate_due"
                     type="date"
-                    placeholder="选择日期"
+                    placeholder="选择月份"
                     @change="timeChange">
                 </el-date-picker>
               </el-form-item>
@@ -107,107 +108,6 @@
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-<!--    <el-dialog title="新 增" append-to-body :visible.sync="dialogFormVisible" width="50%">
-      <div slot="title" style="font-size: 15px">
-        新增账户类型
-      </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
-          <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectname">
-              <el-input v-model="form.projectname" placeholder="请输入项目名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectnum">
-              <el-input v-model="form.projectnum" placeholder="请输入项目编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="当前项目模板" prop="sa_projstagetempid">
-              <el-select v-model="form.sa_projstagetempid" placeholder="请选择当前项目模板" size="mini">
-                <el-option
-                  v-for="item in projectPanl()"
-                  :key="item.sa_projstagetempid"
-                  :label="item.stagetempname"
-                  :value="item.sa_projstagetempid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目类型" prop="projecttype">
-              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
-                <el-option
-                  v-for="(item,index) in projectType()"
-                  :key="index"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目预算" prop="budgetary">
-              <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
-            </el-form-item>
-          </el-col>
-          
-          <el-col :span="12">
-            <el-form-item label="项目规模" prop="scale">
-              <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="预计签约金额" prop="signamount_due">
-              <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目等级" prop="grade">
-              <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
-                <el-option
-                  v-for="item in projectLead()"
-                  :key="item.rowindex"
-                  :label="item.value"
-                  :value="item.rowindex">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目地址" prop="province">
-              <el-cascader
-                  style="width:100%"
-                  v-model="form.province"
-                  :options="basicData.data().areaData"
-                  @change="cascaderChange" clearable>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          
-          <el-col :span="12">
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="预计签约时间" prop="signdate_due">
-              <el-date-picker
-                v-model="form.signdate_due"
-                type="date"
-                placeholder="选择日期"
-                @change="timeChange">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-      </div>
-    </el-dialog>-->
   </div>
 </template>
 
@@ -242,18 +142,18 @@ export default {
         projectname:[
           { required: true, message: '输入项目名称', trigger: 'blur'},
         ],
-        projectnum:[
+        /*projectnum:[
           { required: true, message: '输入项目编号', trigger: 'blur'}
-        ],
+        ],*/
         projecttype:[
           { required: true, message: '请选择项目类型', trigger: 'blur'}
         ],
         sys_enterpriseid:[
           { required: true, message: '请选择企业', trigger: 'blur'},
         ],
-        sa_projstagetempid:[
+        /*sa_projstagetempid:[
           { required: true, message: '请选择当前项目模板', trigger: 'blur'}
-        ],
+        ],*/
         province:[
           { required: true, message: '请选择项目地址', trigger: 'blur'}
         ]

+ 14 - 115
src/Form/projectChange/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" :type="btnType?btnType:'text'" @click="editBtn">编 辑</el-button>
     <el-drawer
-        title="创建用户"
+        title="编辑项目"
         :visible.sync="dialogFormVisible"
         size="800px"
         direction="rtl"
@@ -10,13 +10,13 @@
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="项目名称" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+<!--            <el-col :span="12">
               <el-form-item label="项目编号" prop="projectnum">
                 <el-input v-model="form.projectnum" placeholder="请输入项目编号"></el-input>
               </el-form-item>
@@ -32,9 +32,9 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="12">
-              <el-form-item label="项目类型" prop="projecttype">
+              <el-form-item label="项目类型:" prop="projecttype">
                 <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                   <el-option
                       v-for="(item,index) in projectType()"
@@ -46,23 +46,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目预算" prop="budgetary">
+              <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="项目规模" prop="scale">
+              <el-form-item label="项目规模:" prop="scale">
                 <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="预计签约金额" prop="signamount_due">
+              <el-form-item label="预计签约金额(元):" prop="signamount_due">
                 <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目等级" prop="grade">
+              <el-form-item label="项目等级:" prop="grade">
                 <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                   <el-option
                       v-for="item in projectLead()"
@@ -74,7 +74,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目地址" prop="province">
+              <el-form-item label="项目地址:" prop="province">
                 <el-cascader
                     style="width:100%"
                     v-model="form.province"
@@ -85,16 +85,16 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="详细地址" prop="address">
+              <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="预计签约时间" prop="signdate_due">
+              <el-form-item label="预计签约月份:" prop="signdate_due">
                 <el-date-picker
                     v-model="form.signdate_due"
                     type="date"
-                    placeholder="选择日期"
+                    placeholder="选择月份"
                     @change="timeChange">
                 </el-date-picker>
               </el-form-item>
@@ -107,107 +107,6 @@
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-<!--    <el-dialog title="新 增" append-to-body :visible.sync="dialogFormVisible" width="50%">
-      <div slot="title" style="font-size: 15px">
-        新增账户类型
-      </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
-          <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectname">
-              <el-input v-model="form.projectname" placeholder="请输入项目名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectnum">
-              <el-input v-model="form.projectnum" placeholder="请输入项目编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="当前项目模板" prop="sa_projstagetempid">
-              <el-select v-model="form.sa_projstagetempid" placeholder="请选择当前项目模板" size="mini">
-                <el-option
-                  v-for="item in projectPanl()"
-                  :key="item.sa_projstagetempid"
-                  :label="item.stagetempname"
-                  :value="item.sa_projstagetempid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目类型" prop="projecttype">
-              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
-                <el-option
-                  v-for="(item,index) in projectType()"
-                  :key="index"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目预算" prop="budgetary">
-              <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
-            </el-form-item>
-          </el-col>
-          
-          <el-col :span="12">
-            <el-form-item label="项目规模" prop="scale">
-              <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="预计签约金额" prop="signamount_due">
-              <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目等级" prop="grade">
-              <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
-                <el-option
-                  v-for="item in projectLead()"
-                  :key="item.rowindex"
-                  :label="item.value"
-                  :value="item.rowindex">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目地址" prop="province">
-              <el-cascader
-                  style="width:100%"
-                  v-model="form.province"
-                  :options="basicData.data().areaData"
-                  @change="cascaderChange" clearable>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          
-          <el-col :span="12">
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="预计签约时间" prop="signdate_due">
-              <el-date-picker
-                v-model="form.signdate_due"
-                type="date"
-                placeholder="选择日期"
-                @change="timeChange">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-      </div>
-    </el-dialog>-->
   </div>
 </template>
 

+ 45 - 13
src/HDrpManagement/projectChange/index.vue

@@ -10,26 +10,59 @@
       :options="options"
       :detailPath="{path:'/projectChangeDetail',param:{tabIndex:tabIndex}}">
       <template #titleRight>
-        <el-divider direction="vertical"></el-divider>
+<!--        <el-divider direction="vertical"></el-divider>
         <el-dropdown size="medium" @command="handleCommand">
           <span class="el-dropdown-link">
-            {{tabName}}<i class="el-icon-arrow-down el-icon--right"></i>
+            {{tabName}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-for="(item,index) in editableTabs" :key="index" :command="item">{{item.title}}</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown>-->
       </template>
       <div slot="custom" style="display:flex">
-        <el-select class="inline-16" v-model="statusValue" placeholder="项目状态" @change="onChange" size="small">
-          <el-option
-            v-for="item in statusTab"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-        <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+        <p style="margin: auto" class="inline-16">项目状态</p>
+        <div>
+          <el-select class="inline-16" v-model="statusValue" placeholder="项目状态" @change="onChange" size="small">
+            <el-option
+                v-for="item in statusTab"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+
+
+
+<!--        <el-row>
+          <el-col span="15">
+            <p style="margin: auto">项目状态</p>
+            <el-select class="inline-16" v-model="statusValue" placeholder="项目状态" @change="onChange" size="small">
+              <el-option
+                  v-for="item in statusTab"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col span="8">
+            <p style="margin: auto">项目状态</p>
+            <el-select class="inline-16" v-model="statusValue" placeholder="项目状态" @change="onChange" size="small">
+              <el-option
+                  style="width: 50%"
+                  v-for="item in statusTab"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col span="8">
+            <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+          </el-col>
+        </el-row>-->
       </div>
       <template v-slot:tbList="scope">
         <div
@@ -209,5 +242,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>