bug fixed

src/components/scChengTou/treeSelect.vue

@@ -63,7 +63,7 @@
                             else resolve(this.treeList.filter(t => t.deptId == this.$TOOL.data.get("USER_INFO").deptId));
                         } else resolve(this.treeList.filter(t => t.pid == 0));
 						this.$emit("finished");
-					} else resolve(this.treeList.filter(t => t.pid == data[this.defaultProps.value]));
+					} else resolve(this.treeList.filter(t => t.pid == data[this.defaultProps.value] && t.deptType == "控股公司"));
 				} else resolve([]);
 			},
 

src/style/fix.scss

@@ -55,7 +55,7 @@
 	}
 	.el-tree-node.is-expanded > .el-tree-node__content {background-color: transparent;}
 	.el-tree-node.is-current > .el-tree-node__content {
-		position: relative;;background-color: #ffd9e0;color: var(--el-color-primary);
+		position: relative;background-color: #ffd9e0;color: var(--el-color-primary);
 		&::after {content: "";position: absolute;top: 0;right: 0;bottom: 0;border-right: 3px solid var(--el-color-primary);}
 		&:hover {color: var(--el-color-primary);}
 		.custom-tree-node span.el-tooltip__trigger {font-weight: bold;}

src/views/procurement/plan/index.vue

@@ -12,62 +12,70 @@
         </el-header>
 
         <el-header class="aminui-main-container__query-header">
-            <el-form :model="params">
-                <el-row :gutter="15">
-					<el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="发起人所属公司:">
-							<tree-select ref="deptTreeSelect" v-model="params.deptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择发起人所属公司"></tree-select>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-                        <el-form-item label="业务所属公司:">
-                            <tree-select v-model="params.belongDeptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择业务所属公司"></tree-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="采购名称:">
-                            <el-input v-model="params.planNameLike" clearable placeholder="请输入采购名称"></el-input>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-                        <el-form-item label="采购类别:">
-						    <dict-select ref="dictSelect" v-model="params.type" dic="procurement_category" clearable placeholder="请选择采购类别"></dict-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="10" :md="12" :xs="24">
-                        <el-form-item class="amount-range-item" label="预算金额:">
-                            <el-input-number v-model="params.budgetAmountBegin" step-strictly :controls="false" placeholder="最小值"></el-input-number>-
-                            <el-input-number v-model="params.budgetAmountEnd" step-strictly :controls="false" placeholder="最大值"></el-input-number>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="10" :md="16" :xs="24">
-                        <el-form-item label="计划开始日期:">
-                            <el-date-picker type="daterange" v-model="startDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="10" :md="16" :xs="24">
-                        <el-form-item label="计划完成日期:">
-                            <el-date-picker type="daterange" v-model="endDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="10" :md="16" :xs="24">
-                        <el-form-item label="创建时间:">
-                            <el-date-picker type="daterange" v-model="createDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :md="8" :xs="24">
-                        <el-form-item>
-                            <el-button @click="dateChange('month')">本月</el-button>
-                            <el-button @click="dateChange('year')" >本年</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
+            <el-scrollbar>
+                <el-form :model="params">
+                    <el-row :gutter="15">
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="发起人所属公司:">
+                                <tree-select ref="deptTreeSelect" v-model="params.deptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择发起人所属公司"></tree-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="业务所属公司:">
+                                <tree-select v-model="params.belongDeptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择业务所属公司"></tree-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="采购名称:">
+                                <el-input v-model="params.planNameLike" clearable placeholder="请输入采购名称"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <template v-if="paramsIsCollapse">
+                            <el-col :lg="8" :md="12" :xs="24">
+                                <el-form-item label="采购类别:">
+                                    <dict-select ref="dictSelect" v-model="params.type" dic="procurement_category" clearable placeholder="请选择采购类别"></dict-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="12" :xs="24">
+                                <el-form-item class="amount-range-item" label="预算金额:">
+                                    <el-input-number v-model="params.budgetAmountBegin" step-strictly :controls="false" placeholder="最小值"></el-input-number>-
+                                    <el-input-number v-model="params.budgetAmountEnd" step-strictly :controls="false" placeholder="最大值"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="16" :xs="24">
+                                <el-form-item label="计划开始日期:">
+                                    <el-date-picker type="daterange" v-model="startDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="16" :xs="24">
+                                <el-form-item label="计划完成日期:">
+                                    <el-date-picker type="daterange" v-model="endDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="16" :xs="24">
+                                <el-form-item label="创建时间:">
+                                    <el-date-picker type="daterange" v-model="createDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :md="8" :xs="24">
+                                <el-form-item>
+                                    <el-button @click="dateChange('month')">本月</el-button>
+                                    <el-button @click="dateChange('year')" >本年</el-button>
+                                </el-form-item>
+                            </el-col>
+                        </template>
+                    </el-row>
+                </el-form>
 
-            <el-button-group>
-                <el-button type="primary" icon="el-icon-search" @click="reloadTable('add')">查询</el-button>
-                <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
-            </el-button-group>
+                <el-button-group>
+                    <el-button type="primary" icon="el-icon-search" @click="reloadTable('add')">查询</el-button>
+                    <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
+                    <el-button text @click="paramsIsCollapse = !paramsIsCollapse">
+                        <template v-if="paramsIsCollapse">收起<el-icon><el-icon-arrow-up-bold /></el-icon></template>
+                        <template v-else>更多<el-icon><el-icon-arrow-down-bold /></el-icon></template>
+                    </el-button>
+                </el-button-group>
+            </el-scrollbar>
         </el-header>
 
         <el-container class="aminui-main-container__table-main">
@@ -136,6 +144,7 @@ export default {
             startDate: [],
             endDate: [],
 
+            paramsIsCollapse: false,
             dialog: false
         }
     },
@@ -264,6 +273,13 @@ export default {
   }
 
   .aminui-main-container__query-header {
+    max-height: 218px;
+    display: block;
+
+    :deep(.el-scrollbar__view) {
+      display: flex;
+    }
+
     .amount-range-item :deep(.el-form-item__content) {
       display: flex;
       justify-content: space-between;

src/views/procurement/process/index.vue

@@ -1,73 +1,81 @@
 <template>
     <el-container class="aminui-main-container">
 		<el-header class="aminui-main-container__query-header">
-            <el-form :model="params">
-                <el-row :gutter="15">
-					<el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="发起人所属公司:">
-							<tree-select ref="deptTreeSelect" v-model="params.deptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择发起人所属公司"></tree-select>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-                        <el-form-item label="业务所属公司:">
-                            <tree-select v-model="params.belongDeptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择业务所属公司"></tree-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="流水编号:">
-                            <el-input v-model="params.purchaseNoLike" clearable placeholder="请输入流水编号"></el-input>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="采购申请:">
-                            <el-input v-model="params.nameLike" clearable placeholder="请输入采购申请名称"></el-input>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-                        <el-form-item label="采购类别:">
-						    <dict-select ref="dictSelect" v-model="params.type" dic="procurement_category" clearable placeholder="请选择采购类别"></dict-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="8" :md="12" :xs="24">
-						<el-form-item label="计划内采购:">
-                            <el-select v-model="params.isInPlan" clearable placeholder="请选择是否计划内采购">
-                                <el-option label="是" :value="true"></el-option>
-                                <el-option label="否" :value="false"></el-option>
-                            </el-select>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="10" :md="12" :xs="24">
-                        <el-form-item class="amount-range-item" label="预算金额:">
-                            <el-input-number v-model="params.budgetAmountBegin" step-strictly :controls="false" placeholder="最小值"></el-input-number>-
-                            <el-input-number v-model="params.budgetAmountEnd" step-strictly :controls="false" placeholder="最大值"></el-input-number>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :lg="10" :md="12" :xs="24">
-						<el-form-item label="外部律师选聘:">
-                            <el-select v-model="params.isLawyer" clearable placeholder="请选择是否外部律师选聘">
-                                <el-option label="是" :value="true"></el-option>
-                                <el-option label="否" :value="false"></el-option>
-                            </el-select>
-                        </el-form-item>
-					</el-col>
-                    <el-col :lg="12" :md="16" :xs="24">
-                        <el-form-item label="申请时间:">
-                            <el-date-picker type="daterange" v-model="createDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :md="8" :xs="24">
-                        <el-form-item>
-                            <el-button @click="dateChange('month')">本月</el-button>
-                            <el-button @click="dateChange('year')" >本年</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-
-            <el-button-group>
-                <el-button type="primary" icon="el-icon-search" @click="reloadTable('add')">查询</el-button>
-                <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
-            </el-button-group>
+            <el-scrollbar>
+                <el-form :model="params">
+                    <el-row :gutter="15">
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="发起人所属公司:">
+                                <tree-select ref="deptTreeSelect" v-model="params.deptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择发起人所属公司"></tree-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="业务所属公司:">
+                                <tree-select v-model="params.belongDeptId" :apiObj="$API.system.dept" isDept isAllDept check-strictly clearable placeholder="请选择业务所属公司"></tree-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :lg="8" :md="12" :xs="24">
+                            <el-form-item label="流水编号:">
+                                <el-input v-model="params.purchaseNoLike" clearable placeholder="请输入流水编号"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <template v-if="paramsIsCollapse">
+                            <el-col :lg="8" :md="12" :xs="24">
+                                <el-form-item label="采购申请:">
+                                    <el-input v-model="params.nameLike" clearable placeholder="请输入采购申请名称"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="8" :md="12" :xs="24">
+                                <el-form-item label="采购类别:">
+                                    <dict-select ref="dictSelect" v-model="params.type" dic="procurement_category" clearable placeholder="请选择采购类别"></dict-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="8" :md="12" :xs="24">
+                                <el-form-item label="计划内采购:">
+                                    <el-select v-model="params.isInPlan" clearable placeholder="请选择是否计划内采购">
+                                        <el-option label="是" :value="true"></el-option>
+                                        <el-option label="否" :value="false"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="12" :xs="24">
+                                <el-form-item class="amount-range-item" label="预算金额:">
+                                    <el-input-number v-model="params.budgetAmountBegin" step-strictly :controls="false" placeholder="最小值"></el-input-number>-
+                                    <el-input-number v-model="params.budgetAmountEnd" step-strictly :controls="false" placeholder="最大值"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="10" :md="12" :xs="24">
+                                <el-form-item label="外部律师选聘:">
+                                    <el-select v-model="params.isLawyer" clearable placeholder="请选择是否外部律师选聘">
+                                        <el-option label="是" :value="true"></el-option>
+                                        <el-option label="否" :value="false"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :lg="12" :md="16" :xs="24">
+                                <el-form-item label="申请时间:">
+                                    <el-date-picker type="daterange" v-model="createDate" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :md="8" :xs="24">
+                                <el-form-item>
+                                    <el-button @click="dateChange('month')">本月</el-button>
+                                    <el-button @click="dateChange('year')" >本年</el-button>
+                                </el-form-item>
+                            </el-col>
+                        </template>
+                    </el-row>
+                </el-form>
+
+                <el-button-group>
+                    <el-button type="primary" icon="el-icon-search" @click="reloadTable('add')">查询</el-button>
+                    <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
+                    <el-button text @click="paramsIsCollapse = !paramsIsCollapse">
+                        <template v-if="paramsIsCollapse">收起<el-icon><el-icon-arrow-up-bold /></el-icon></template>
+                        <template v-else>更多<el-icon><el-icon-arrow-down-bold /></el-icon></template>
+                    </el-button>
+                </el-button-group>
+            </el-scrollbar>
         </el-header>
 
         <el-container class="aminui-main-container__table-main">
@@ -174,6 +182,7 @@ export default {
                 type: null
             },
 
+            paramsIsCollapse: false,
             selectData: null,
             dialog: {
                 detail: false,
@@ -371,6 +380,13 @@ export default {
 <style lang="scss" scoped>
 .aminui-main-container {
   .aminui-main-container__query-header {
+    max-height: 218px;
+    display: block;
+
+    :deep(.el-scrollbar__view) {
+      display: flex;
+    }
+
     .amount-range-item :deep(.el-form-item__content) {
       display: flex;
       justify-content: space-between;

src/views/supplier/signed/save.vue

@@ -13,7 +13,7 @@
 					<scTitle>基本信息</scTitle>
 					<el-row :gutter="15">
 						<el-col :lg="8" :md="12" :xs="24">
-							<el-form-item label="企业编码:" prop="supplierNo">
+							<el-form-item label="企业编码:">
 								<el-input v-model="form.supplierNo" placeholder="请输入企业编码"></el-input>
 							</el-form-item>
 						</el-col>
@@ -244,7 +244,6 @@
 				},
 
 				rules: {
-					supplierNo: [{ required: true, message: "请输入企业编码" }],
 					supplierName: [{ required: true, message: "请输入供应商名称" }],
 					creditCode: [{ required: true, message: "请输入统一社会信用代码" },
 						{ validator: (rule, value, callback) => {

src/views/system/project/main.js

@@ -1,10 +0,0 @@
-export const column = [
-    { label: "企业编码", prop: "supplierNo", width: "150", align: "center" },
-    { label: "供应商名称", prop: "supplierName", width: "200", align: "center", showOverflowTooltip: true },
-    { label: "服务类别", prop: "supplierType", width: "120", align: "center" },
-    { label: "统一社会信用代码", prop: "creditCode", width: "200", align: "center", showOverflowTooltip: true },
-    { label: "主要联系人", prop: "contactName", width: "120", align: "center" },
-    { label: "成立日期", prop: "establishDate", width: "140", align: "center" },
-    { label: "中标次数", prop: "bidCount", width: "120", align: "center" },
-    { label: "累计签约 (元)", prop: "totalAmount", width: "140", align: "center" }
-]