Merge remote-tracking branch 'origin/dev_v2' into dev_v2

RuoYi-Mobile-master/pages/work/approve/bargainDtl.vue

@@ -3,7 +3,7 @@
 		<pageHead pageTitle="议价审批" :showBack="true" style="margin-bottom: 10px;"></pageHead>
 		<view class="list-card">
 			<u--form ref="form" :model="bargainInfo" labelPosition="left" labelWidth="80" :labelStyle="{'color': '#6B7688','fontSize':'16px'}" >
-		
+
 				<u-form-item label="项目名称" prop="projectName">
 				 <view class="val-posi">{{bargainInfo.projectName}}</view>
 				</u-form-item>
@@ -22,11 +22,11 @@
 			  <u-form-item label="代理商" prop="agentName" >
 			    <view class="val-posi">{{bargainInfo.agentName}}</view>
 			  </u-form-item>
-			 
+
 			</u--form>
 		</view>
-		
-		
+
+
 		<view class="list-card" >
 			<view class="card-title">电梯列表</view>
 			<view v-for="(item, index) in bargainInfo.elevatorList">
@@ -50,9 +50,9 @@
 				    <view class="val-posi">{{stateFormatLow(item.price,0)}}</view>
 				  </u-form-item>
 				 <u-form-item label="基价折率" prop="discountRate">
-				   <u-input v-model="item.discountRate" placeholder="请输入基价折率" type="digit" inputAlign="right" 
-				   style="font-size: 16px;" :maxlength="30" border="none" @blur="changeRate(item)"></u-input>
-				   %
+				   <u-input v-model="item.discountRate" placeholder="请输入基价折率" type="digit" inputAlign="right" border="surround"
+				   style="font-size: 16px;" :maxlength="30" @blur="changeRate(item)" :customStyle="{width:'150px'}"></u-input>
+					<span style="margin-left: 5px;">%</span>
 				 </u-form-item>
 				 <u-form-item label="折后价格" prop="price" >
 				   <view class="val-posi">{{stateFormatLow(item.discountPrice,0)}}</view>
@@ -61,12 +61,12 @@
 				<u-divider class="divider"></u-divider>
 			</view>
 		</view>
-	
-	
+
+
 		<view class="list-card" style="padding: 16px 10px;">
 			<view class="card-title">价格信息</view>
 			<u-row  gutter="4" style="margin-bottom: 8px;">
-			            
+
 			    <u-col span="4" >
 			       <view class="card__price">
 					 <view class="txt-label">价格合计</view>
@@ -76,41 +76,41 @@
 			    <u-col span="4">
 					<view class="card__price">
 						<view class="txt-label">基价合计</view>
-						<view class="txt-value">¥{{stateFormatLow(bargainInfo.basicPriceTotal,0)}}</view>				 
+						<view class="txt-value">¥{{stateFormatLow(bargainInfo.basicPriceTotal,0)}}</view>
 					</view>
 			    </u-col>
 			    <u-col span="4">
 			       <view class="card__price">
 			       	<view class="txt-label">选配合计</view>
-			       	<view class="txt-value">¥{{stateFormatLow(bargainInfo.optionalPriceTotal,0)}}</view>				 
+			       	<view class="txt-value">¥{{stateFormatLow(bargainInfo.optionalPriceTotal,0)}}</view>
 			       </view>
 			    </u-col>
-				
+
 			</u-row>
 			<u-row gutter="4">
 				<u-col span="4">
 					<view class="card__price">
 						<view class="txt-label">希望价格</view>
-						<view class="txt-value2">¥{{stateFormatLow(bargainInfo.expectedPrice,0)}}</view>				 
-					</view>				
+						<view class="txt-value2">¥{{stateFormatLow(bargainInfo.expectedPrice,0)}}</view>
+					</view>
 				</u-col>
 				<u-col span="4">
 					<view class="card__price">
 						<view class="txt-label">希望基价折率</view>
-						<view class="txt-value2">{{bargainInfo.basicPriceRate}}%</view>				 
-					</view>				
-				</u-col>	 
+						<view class="txt-value2">{{bargainInfo.basicPriceRate}}%</view>
+					</view>
+				</u-col>
 				<u-col span="4">
 					<view class="card__price">
 						<view class="txt-label">实际基价折率</view>
-						<view class="txt-value2">{{bargainInfo.discountRate}}%</view>				 
-					</view>				
-				</u-col>	 
+						<view class="txt-value2">{{bargainInfo.discountRate}}%</view>
+					</view>
+				</u-col>
 			</u-row>
 		</view>
-			
+
 		<view style="height: 75px;"></view>
-	
+
 		<view class="card_bottom ">
 			<view class="flex-center" style="width: 100%;">
 				<view class="list-card__price" >
@@ -129,8 +129,8 @@
 				</view>
 			</view>
 		</view>
-	
-	
+
+
 		<!-- 弹窗 -->
 		<view>
 			<!-- 驳回弹窗 -->
@@ -154,7 +154,7 @@
 					</view>
 				</view>
 			</uni-popup>
-		
+
 			<!-- 通过弹窗 -->
 			<uni-popup ref="popupPass" background-color="#fff" borderRadius="10px 10px 10px 10px" style="width: 90%;">
 				<view class="popup-content" style="padding: 20rpx 40rpx" >
@@ -178,7 +178,7 @@
 					</view>
 				</view>
 			</uni-popup>
-			
+
 			<!-- 确认弹窗 -->
 			<uni-popup ref="popupConfirm" background-color="#fff" borderRadius="10px 10px 10px 10px" style="width: 90%;">
 				<view class="popup-content" style="padding: 20rpx 40rpx" >
@@ -189,7 +189,7 @@
 					<view style="text-align: center;margin: 30rpx 0">
 						<text style="color: rgba(0, 0, 0, 0.85);">是否确认?</text>
 					</view>
-					
+
 					<view class="flex-center mt32" style="margin-bottom: 30rpx;">
 						<view class="button-left-one flex-center-middle" @click="closePup()">
 							<img class="button-icon" src="@/static/img/approve/reject.png" alt="" />
@@ -219,7 +219,7 @@
 					pageNum: 1,
 					pageSize: 5
 				},
-			
+
 				bargainInfo:{},
 				bargainLoadAll: false,
 				bargainId:'',
@@ -258,7 +258,7 @@
 				//设置实体
 				let bargainObj = {}
 				let auditForm = {}
-				
+
 				if (status == '02') {
 					//驳回
 					bargainObj = {
@@ -297,7 +297,7 @@
 					  businessObj: bargainObj
 					}
 				}
-				
+
 				if (status == '02') {
 					auditForm.remark += '，驳回原因：'+ this.returnMsg
 				}
@@ -309,14 +309,14 @@
 								mask: true,
 								title: '操作成功',
 							})
-							
+
 						}, 500)
 						//调回上一页
 						this.goBack()
 					}
 				})
 			},
-			
+
 			changeRate(item){
 				if(item.discountRate < 1){
 					item.discountRate = 1
@@ -346,7 +346,7 @@
 				//折扣率格式化
 				this.bargainInfo.discountRate = Number(discountRate).toFixed(4)
 			},
-			stateFormat,	
+			stateFormat,
 			stateFormatLow,
 			getBargainInfo() {
 				ApproveApi.bargainById(this.quotationId).then(res => {
@@ -364,7 +364,7 @@
 					}
 				})
 			},
-			
+
 			async doSP(status){
 				const that = this
 				let res = await ApproveApi.getSalesDiscount(this.quotationId);
@@ -388,14 +388,14 @@
 				}else{
 					this.handleApprove(status)
 				}
-	
+
 			},
-			
+
 			// 审批
 			handleApproveOld(status) {
 				let bargainObj = {}
 				let auditForm = {}
-				
+
 				if (status == '02') {
 					//驳回
 					bargainObj = {
@@ -434,8 +434,8 @@
 					  businessObj: bargainObj
 					}
 				}
-				
-				
+
+
 				const that = this
 				uni.showModal({
 					title: status == '02' ? '是否确认驳回' : '是否确认通过',
@@ -456,7 +456,7 @@
 											mask: true,
 											title: '操作成功',
 										})
-										
+
 									}, 500)
 									//调回上一页
 									that.goBack()
@@ -471,7 +471,7 @@
 			  uni.navigateTo({
 			  	url: '/pages/work/approve/list'
 			  })
-			  
+
 			}
 		}
 	}
@@ -508,21 +508,21 @@
 				line-height: 44rpx;
 			}
 		}
-		
+
 		.button-right {
 			width: 48%;
 			height: 84rpx;
 			background: linear-gradient(90deg, #DC0736 0%, #E60114 100%);
 			box-shadow: 0px 5px 6px 0px #EADEDF;
 			border-radius: 0rpx 200rpx 200rpx 0rpx;
-		
+
 			.pass-text {
 				font-size: 32rpx;
 				color: #FFFFFF;
 				line-height: 44rpx;
 			}
 		}
-		
+
 	}
 	.card-title{
 		font-weight: 600;
@@ -560,7 +560,7 @@
 		text-align: right;
 		font-size: 16px;
 	}
-	
+
 	::v-deep .u-badge--error {
 		background-color: #E60114;
 	}
@@ -676,10 +676,10 @@
 				}
 			}
 		}
-	
+
 		.popup-content {
 			padding: 20rpx 20rpx;
-			
+
 			.return_content{
 				width: 92%;
 				padding: 20rpx 28rpx;
@@ -698,7 +698,7 @@
 				height: 28rpx;
 				margin-right: 8rpx;
 			}
-			
+
 			.button-left {
 				width: 350rpx;
 				height: 84rpx;
@@ -711,14 +711,14 @@
 					line-height: 44rpx;
 				}
 			}
-			
+
 			.button-right {
 				width: 350rpx;
 				height: 84rpx;
 				background: linear-gradient(90deg, #DC0736 0%, #E60114 100%);
 				border-radius: 0rpx 200rpx 200rpx 0rpx;
 				box-shadow: 0px 2px 8px 0px #DFDFDF;
-			
+
 				.pass-text {
 					font-size: 32rpx;
 					color: #FFFFFF;
@@ -737,14 +737,14 @@
 					line-height: 44rpx;
 				}
 			}
-			
+
 			.button-right-one {
 				width: 220rpx;
 				height: 84rpx;
 				background: linear-gradient(90deg, #DC0736 0%, #E60114 100%);
 				border-radius: 200rpx;
 				box-shadow: 0px 2px 8px 0px #DFDFDF;
-			
+
 				.pass-text {
 					font-size: 32rpx;
 					color: #FFFFFF;
@@ -753,4 +753,4 @@
 			}
 		}
 	}
-</style>
+</style>

ruoyi-ui-vue2/src/views/crmManagement/elevatorModel/index.vue

@@ -121,7 +121,7 @@
     </card-table>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body :close-on-click-modal="false" @close="reset">
+    <el-dialog :title="title" :visible.sync="open" width="760px" append-to-body :close-on-click-modal="false" @close="reset">
       <el-form ref="form" :model="form" :rules="rules" class="area-form" label-position="top">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -153,7 +153,7 @@
         <el-row>
           <el-form-item :label="$t('适用国家')" prop="countryIds">
             <el-transfer class="transfer-box" ref="myTransfer" v-model="form.countryIds" :data="nationList" filterable
-              :filter-placeholder="$t('common.pleaseInput')"></el-transfer>
+              :filter-placeholder="$t('common.pleaseInput')" style="width: 100%"></el-transfer>
           </el-form-item>
         </el-row>
 
@@ -1245,15 +1245,13 @@ export default {
     },
     addTargetsDialog() {
       this.isAddTargets = true;
-      console.log("this.selectUserIdSet",this.selectUserIdSet)
       this.$nextTick(() => {
-        this.getUserList()
+        this.resetQueryUserSelect()
       })
     },
     submitTargetsForm() {
       const myArray = Array.from(this.userSelectionListNowSet);
       if (myArray.length <= 0) {
-        console.log("myArray.length <= 0")
         return this.isAddTargets = false;
       }
       if (this.targetsList.length > 0) {

ruoyi-ui-vue2/src/views/crmManagement/paraLibrary/selectItem.vue

@@ -294,7 +294,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.form.paraCode = this.paraCode
+      //this.form.paraCode = this.paraCode
       this.open = true;
       this.title = this.$t('selectItem.addItem');
     },

ruoyi-ui-vue2/src/views/quotation/editQuotation.vue

@@ -187,8 +187,8 @@
             <el-table-column prop="price" :label="$t('quotation.price')" v-if="typeNotIn(['add','edit'])" min-width="100px" align="right">
               <template slot-scope="scope">
                 {{ numFormat(scope.row.price) }}
-                <!--               已出价的才能看到价格，上线后放开 -->
-                <!--                <span v-if="Number(scope.row.quotationStatus) >= 6">{{ numFormat(scope.row.price) }}</span>-->
+                <!--               状态大于等于5的才能看到价格，上线后放开 -->
+                <!--                <span v-if="Number(scope.row.quotationStatus) >= 5">{{ numFormat(scope.row.price) }}</span>-->
                 <!--                <span v-else>-</span>-->
               </template>
             </el-table-column>

ruoyi-ui-vue2/src/views/quotation/quotation.vue

@@ -145,7 +145,7 @@
             <!--币种 -->
             <el-form-item :label="$t('project.currency')" prop="currency">
               <el-select :disabled="true" v-model="form.currencyId" class="w-100" :placeholder="$t('common.pleaseSelect') + $t('project.currency')">
-                <el-option v-for="dict in currencyList" :key="dict.value"
+                <el-option v-for="dict in dict.type.currency_type" :key="dict.value"
                            :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
@@ -470,7 +470,7 @@ export default {
         quotationId: row.id,
         projectNo: row.projectNo,
         projectName: row.projectName,
-        currencyId: row.currencyId,
+        currencyId: row.currencyId + '',
         quotationNo: row.quotationNo,
         version: row.version,
       };