pengyh пре 1 година
родитељ
комит
99848934c9

+ 1 - 1
src/views/auxiliaryFittings/projectAttachmentManage/detail.vue

@@ -128,7 +128,7 @@
 				</el-form>
 			</div>
 		</el-card>
-		<el-card class="box-card" v-if="detail.waitPrice > 0">
+		<el-card class="box-card">
 			<div slot="header" class="clearfix">
 				<span>收款信息</span>
 			</div>

+ 1 - 1
src/views/auxiliaryFittings/projectAuxiliaryManage/detail.vue

@@ -128,7 +128,7 @@
 				</el-form>
 			</div>
 		</el-card>
-		<el-card class="box-card" v-if="detail.waitPrice > 0">
+		<el-card class="box-card">
 			<div slot="header" class="clearfix">
 				<span>收款信息</span>
 			</div>

+ 18 - 10
src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -125,16 +125,19 @@
 						<template v-if="formData.salesType == '工程'">
 							<el-col :span="8">
 								<el-form-item label="工程名称" prop="project" :required="true">
-									<el-select v-model="formData.project" value-key="id" @change="(e)=>{
-											formData.orderEnginBaseId = e.id
-										}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
-									    <el-option
-										  v-for="(item,index) in projectList"
-									      :key="index"
-									      :label="item.projectName"
-									      :value="item">
-									    </el-option>
-									</el-select>
+									<div style="display: flex;align-items: center;">
+										<el-select v-model="formData.project" value-key="id" @change="(e)=>{
+												formData.orderEnginBaseId = e.id
+											}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
+										    <el-option
+											  v-for="(item,index) in projectList"
+										      :key="index"
+										      :label="item.projectName"
+										      :value="item">
+										    </el-option>
+										</el-select>
+										<i class="el-icon-circle-plus" @click="toAddProject" style="transform: scale(1.5);color: #1989FA;margin-left: 10px;cursor: pointer;"></i>
+									</div>
 								</el-form-item>
 							</el-col>
 							<el-col :span="6">
@@ -495,6 +498,11 @@
 				this.formData.websitName = e.name
 				this.getWorker()
 			},
+			toAddProject(){
+				this.$router.push({
+					name: 'basicEngineeringData'
+				})
+			},
 			getProject(){
 				getProject({
 					pageNum: 1,

+ 23 - 10
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -125,16 +125,24 @@
 						<template v-if="formData.salesType == '工程'">
 							<el-col :span="8">
 								<el-form-item label="工程名称" prop="project" :required="true">
-									<el-select v-model="formData.project" value-key="id" @change="(e)=>{
-											formData.orderEnginBaseId = e.id
-										}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
-									    <el-option
-										  v-for="(item,index) in projectList"
-									      :key="index"
-									      :label="item.projectName"
-									      :value="item">
-									    </el-option>
-									</el-select>
+									<div style="display: flex;align-items: center;">
+										<el-select v-model="formData.project" value-key="id" @change="(e)=>{
+												formData.orderEnginBaseId = e.id
+											}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
+										    <el-option
+											  v-for="(item,index) in projectList"
+										      :key="index"
+										      :label="item.projectName"
+										      :value="item">
+										    </el-option>
+										</el-select>
+										<i class="el-icon-circle-plus" @click="toAddProject" style="transform: scale(1.5);color: #1989FA;margin-left: 10px;cursor: pointer;"></i>
+									</div>
+								</el-form-item>
+							</el-col>
+							<el-col :span="1">
+								<el-form-item label="工程编号" :required="true">
+									<el-input type="text" :disabled="true" v-model="formData.project.projectNo" placeholder="请输入"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="6">
@@ -532,6 +540,11 @@
 					this.mainList = res.data
 				})
 			},
+			toAddProject(){
+				this.$router.push({
+					name: 'basicEngineeringData'
+				})
+			},
 			getProject(){
 				getProject({
 					pageNum: 1,