zhuangyunsheng vor 1 Jahr
Ursprung
Commit
01f0dc7130

+ 2 - 2
.env.development

@@ -8,8 +8,8 @@ VUE_APP_TITLE = 城发集团招采管理平台
 # VUE_APP_API_BASEURL = http://www.qdeasydo.com
 # VUE_APP_API_BASEURL = http://192.168.101.93:8810
 
-VUE_APP_API_BASEURL = http://172.16.1.150:8810
-# VUE_APP_API_BASEURL = http://172.16.1.132:8810
+# VUE_APP_API_BASEURL = http://172.16.1.150:8810
+VUE_APP_API_BASEURL = http://172.16.1.132:8810
 
 # 本地端口
 VUE_APP_PORT = 7800

+ 4 - 4
src/components/scChengTou/purchase/apply.vue

@@ -63,12 +63,12 @@
 			</el-col>
 			<el-col :lg="lg" :md="12" :xs="24">
 				<el-form-item label="采购类别:" prop="type">
-					<dict-select ref="dictSelect" v-model="form.type" dic="procurement_category" filterable placeholder="请选择采购类别" @change="typeChange"></dict-select>
+					<dict-select ref="procurement_category" v-model="form.type" dic="procurement_category" filterable placeholder="请选择采购类别" @change="typeChange"></dict-select>
 				</el-form-item>
 			</el-col>
             <el-col v-if="form.type && !isEngineering" :lg="lg" :md="12" :xs="24">
 				<el-form-item label="专项费用类型:" prop="specialFeeType">
-					<dict-select v-model="form.specialFeeType" dic="special_expenses_type" filterable placeholder="请选择专项费用类型"></dict-select>
+					<dict-select ref="special_expenses_type" v-model="form.specialFeeType" dic="special_expenses_type" filterable placeholder="请选择专项费用类型"></dict-select>
 				</el-form-item>
 			</el-col>
             <el-col :lg="lg" :md="12" :xs="24">
@@ -224,8 +224,8 @@
 		},
 
 		methods: {
-			formatType(value) {
-				const dicts = this.$refs.dictSelect && this.$refs.dictSelect.options || [];
+			formatType(value, refName = "procurement_category") {
+				const dicts = this.$refs[refName] && this.$refs[refName].options || [];
 				return dicts && dicts.find(d => d.value == value) && dicts.find(d => d.value == value).label || "";
 			},
 

+ 7 - 33
src/components/scChengTou/purchase/handler.vue

@@ -28,12 +28,12 @@
 			</el-col>
 			<el-col :lg="lg" :md="12" :xs="24">
 				<el-form-item label="采购类别:">
-					<dict-select ref="dictSelect" v-model="apply.type" dic="procurement_category" disabled placeholder="自动带出"></dict-select>
+					<dict-select ref="procurement_category" v-model="apply.type" dic="procurement_category" disabled placeholder="自动带出"></dict-select>
 				</el-form-item>
 			</el-col>
             <el-col v-if="apply.type && !isEngineering" :lg="lg" :md="12" :xs="24">
 				<el-form-item label="专项费用类型:" prop="specialFeeType">
-					<dict-select v-model="apply.specialFeeType" dic="special_expenses_type" disabled placeholder="自动带出"></dict-select>
+					<dict-select ref="special_expenses_type" v-model="apply.specialFeeType" dic="special_expenses_type" disabled placeholder="自动带出"></dict-select>
 				</el-form-item>
 			</el-col>
 			<el-col :lg="lg" :md="12" :xs="24">
@@ -43,26 +43,7 @@
 			</el-col>
 			<el-col :lg="lg" :md="12" :xs="24">
 				<el-form-item label="创建人:" prop="createId">
-					<sc-table-select v-model="form.person" :apiObj="tableSelect.apiObj" :table-width="840" :props="tableSelect.props" disabled placeholder="请选择创建人" placement="bottom">
-						<template #header="{ queryForm, submit: fetchPerson }">
-							<el-row :gutter="15">
-								<el-col :md="8" :xs="24">
-									<el-form-item>
-										<el-input class="search-input-suffix" v-model="queryForm.blurry" clearable placeholder="输入姓名、账号、手机关键字" @keyup.enter="fetchPerson" @clear="fetchPerson">
-											<template #suffix>
-												<el-icon @click="fetchPerson"><el-icon-search /></el-icon>
-											</template>
-										</el-input>
-									</el-form-item>
-								</el-col>
-							</el-row>
-						</template>
-
-						<el-table-column label="姓名" prop="username" align="center"></el-table-column>
-						<el-table-column label="账号" prop="nickName" align="center"></el-table-column>
-						<el-table-column label="所属组织" prop="dept.name" align="center"></el-table-column>
-						<el-table-column label="手机" prop="phone" align="center"></el-table-column>
-					</sc-table-select>
+					<el-input v-model="form.createName" disabled></el-input>
 				</el-form-item>
 			</el-col>
             <el-col :lg="lg" :md="12" :xs="24">
@@ -97,7 +78,7 @@
             <!-- 金额 -->
 			<el-col :lg="lg" :md="12" :xs="24">
 				<el-form-item v-if="mode == 'purchase_bid_notice'" label="中标单位:" prop="supplierId">
-					<el-select v-model="form.supplierId" filterable multiple placeholder="请选择中标单位" @change="supplierChange">
+					<el-select v-model="form.supplierId" filterable multiple collapse-tags collapse-tags-tooltip placeholder="请选择中标单位" @change="supplierChange">
 						<el-option v-for="item in suppliers" :key="item.id" :label="item.supplierName" :value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
@@ -220,11 +201,6 @@
 				projects: [],
 				suppliers: [],
 
-				tableSelect: {
-					apiObj: this.$API.system.user,
-					props: { page: "page", label: "nickName" }
-				},
-
 				apply: {
 					name: null,
 					deptId: null,
@@ -243,7 +219,6 @@
 					id: null,
 					approveTitle: null,
 					purchaseId: null,
-					person: { ...this.$TOOL.data.get("USER_INFO") },
 					createId: this.$TOOL.data.get("USER_INFO").id,
 					createName: this.$TOOL.data.get("USER_INFO").nickName,
 					bidAmount: null,
@@ -314,8 +289,8 @@
 				return modeArray[0] + suffixArray.map(str => this.$TOOL.capitalizeWords(str)).join("");
 			},
 
-            formatType(value) {
-				const dicts = this.$refs.dictSelect && this.$refs.dictSelect.options || [];
+            formatType(value, refName = "procurement_category") {
+				const dicts = this.$refs[refName] && this.$refs[refName].options || [];
 				return dicts && dicts.find(d => d.value == value) && dicts.find(d => d.value == value).label || "";
 			},
 
@@ -362,8 +337,7 @@
                                         this.form[key][folder_key]["entities"] = model[key][folder_key].entities.map(({ id, mineType, name, path }) => ({ id, mineType, name, path })) || []
                                     }
 								}
-							} else if (key == "person") this.form[key] = { id: model.createId, nickName: model.createName };
-							else if (key == "supplierId") this.form[key] = model.bidCompanyIds && model.bidCompanyIds.split(",") || [];
+							} else if (key == "supplierId") this.form[key] = model.bidCompanyIds && model.bidCompanyIds.split(",") || [];
 							else this.form[key] = model[key] || null;
 						}
 

+ 9 - 2
src/views/procurement/process/detail.vue

@@ -103,9 +103,16 @@
 				}
 				if (templateId) data["templateId"] = templateId;
 				if (userTaskAssigneePropsList) data["userTaskAssigneePropsList"] = userTaskAssigneePropsList;
-				if (dataContext) data["extData"] = { dataContext, isCostApprovalRequired: this.$refs.scApply.form.isCostApprovalRequired || "0" };
+				if (dataContext) {
+                    data["extData"] = {
+                        dataContext,
+                        isCostApprovalRequired: this.$refs.scApply.form.isCostApprovalRequired || "0",
+                        specialExpensesType: this.$refs.scApply.formatType(this.$refs.scApply.form.specialFeeType, "special_expenses_type"),
+                        externalLawyerSelection: this.$refs.scApply.form.isLawyer + ""
+                    };
+                }
 				if (mode == "resubmit") data["processTaskId"] = this.form.processTaskId;
-
+                
 				this.isSaveing = true;
 				this.$API.procurement.apply[mode](data).then(() => {
 					this.isSaveing = false;

+ 3 - 2
src/views/procurement/process/handle.vue

@@ -120,11 +120,12 @@
 				if (dataContext) {
                     data["extData"] = { dataContext };
 				    if (this.mode == "purchase_bid_sign") data["extData"]["isCostApprovalRequired"] = this.$refs.scHandler.form.isCostApprovalRequired || "0";
+				    if (this.mode == "purchase_matter" || this.mode == "purchase_bid_sign") data["extData"]["specialExpensesType"] = this.$refs.scHandler.formatType(this.$refs.scHandler.apply.specialFeeType, "special_expenses_type");
                 }
 				if (this.mode == "purchase_bid_notice") data["projectId"] = this.$refs.scHandler.apply.projectId || null;
 				if (mode == "resubmit") data["processTaskId"] = this.form.processTaskId;
-                
-				this.isSaveing = true;
+				
+                this.isSaveing = true;
 				this.$API.procurement[this.$refs.scHandler.handlerKey()][mode](data).then(() => {
 					this.isSaveing = false;
 					this.$message.success("操作成功");

+ 1 - 1
src/views/supplier/signed/index.vue

@@ -6,7 +6,7 @@
 			<el-container>
 				<el-header class="aminui-main-container__query-header">
 					<scTitle>服务类别</scTitle>
-					<el-form>
+					<el-form @submit.prevent>
 						<el-form-item>
 							<el-input v-model="aside.filterText" clearable placeholder="输入要检索的类别名称"></el-input>
 						</el-form-item>

+ 1 - 1
src/views/system/dict/components/approveInfo.vue

@@ -39,7 +39,7 @@
 
 		data() {
 			return {
-				api: this.$API.system.approveInfo,
+				api: null,
 				column: [
 					{ label: "表单名称", prop: "formName", width: "140", align: "center" },
 					{ label: "业务类型", prop: "busType", width: "200", align: "center" },

+ 1 - 1
src/views/system/dict/components/type.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-header class="aminui-main-container__query-header">
 		<scTitle>供应商类别</scTitle>
-		<el-form :model="params">
+		<el-form :model="params" @submit.prevent>
 			<el-row :gutter="15">
 				<el-col :lg="8" :md="11" :xs="24">
 					<el-form-item>

+ 3 - 2
src/views/system/dict/index.vue

@@ -4,7 +4,7 @@
 			<el-container>
 				<el-header class="aminui-main-container__query-header">
 					<scTitle>字典列表</scTitle>
-					<el-form>
+					<el-form @submit.prevent>
 						<el-form-item>
 							<el-input v-model="aside.filterText" clearable placeholder="输入关键字进行过滤"></el-input>
 						</el-form-item>
@@ -161,7 +161,8 @@
 				this.$nextTick(() => {
 					if (data.id == 1) this.$refs.evaluateRules.reloadData();
 					else if (data.id == 15) this.$refs.supplierType.api = this.$API.supplier.type;
-					else {
+					else if (data.id == 21) this.$refs.approveInfo.api = this.$API.system.approveInfo;
+                    else {
 						if (!this.table.api) this.table.api = this.$API.system.dictDetail;
 						else this.reloadTable();
 					}

+ 1 - 1
src/views/system/job/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-container class="aminui-main-container">
 		<el-header class="aminui-main-container__query-header">
-			<el-form :model="params">
+			<el-form :model="params" @submit.prevent>
 				<el-row :gutter="15">
 					<el-col :md="8" :xs="24">
 						<el-form-item label="岗位名称:">

+ 1 - 1
src/views/system/menu/index.vue

@@ -4,7 +4,7 @@
 			<el-container>
 				<el-header class="aminui-main-container__query-header">
 					<scTitle>菜单列表</scTitle>
-					<el-form>
+					<el-form @submit.prevent>
 						<el-form-item>
 							<el-input v-model="aside.filterText" clearable placeholder="输入关键字进行过滤"></el-input>
 						</el-form-item>

+ 2 - 2
src/views/system/orgPerson/index.vue

@@ -4,7 +4,7 @@
 			<el-container>
 				<el-header class="aminui-main-container__query-header">
 					<scTitle>组织结构</scTitle>
-					<el-form>
+					<el-form @submit.prevent>
 						<el-form-item>
 							<el-input v-model="aside.filterText" clearable placeholder="输入要检索的组织机构"></el-input>
 						</el-form-item>
@@ -47,7 +47,7 @@
 		<el-container>
 			<el-header class="aminui-main-container__query-header">
 				<scTitle>{{ table.deptName || "组织人员列表" }}</scTitle>
-				<el-form :model="table.params">
+				<el-form :model="table.params" @submit.prevent>
 					<el-row :gutter="15">
 						<el-col :lg="10" :md="14" :xs="24">
 							<el-form-item>

+ 1 - 1
src/views/system/role/index.vue

@@ -2,7 +2,7 @@
 	<el-container class="aminui-main-container">
 		<el-container class="is-vertical">
 			<el-header class="aminui-main-container__query-header">
-				<el-form :model="params">
+				<el-form :model="params" @submit.prevent>
 					<el-row :gutter="15">
 						<el-col :lg="10" :md="14" :xs="24">
 							<el-form-item label="角色名称:">