From 9ae1a7ddc211628995ff8ec2bea073fee3601130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Thu, 20 Jan 2022 15:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/add-paper/index.vue        | 35 ++++++++++++++------------------
 pages/mall/index.vue             |  2 +-
 pages/submit-quotation/index.vue | 11 ++++++----
 pages/trade/quotationList.vue    |  6 ++++--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index bc26f31..dad1bb3 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -14,7 +14,7 @@
 					<text class="add-paper-text">纸品名称</text>
 				</view>
 				<view class="add-paper-input">
-					<qn-easyinput type="text" :styles="{ disableColor: '#fff' }" v-model="form.name" :inputBorder="false" text="right" placeholder="请输入纸品名称"></qn-easyinput>
+					<qn-easyinput type="text" :maxlength="100" :styles="{ disableColor: '#fff' }" v-model="form.name" :inputBorder="false" text="right" placeholder="请输入纸品名称"></qn-easyinput>
 				</view>
 			</view>
 			<view class="add-paper-border"></view>
@@ -30,6 +30,7 @@
 						v-model="form.manufacturerName"
 						:inputBorder="false"
 						text="right"
+						:maxlength="100"
 						placeholder="请输入纸厂信息"
 					></qn-easyinput>
 				</view>
@@ -47,7 +48,8 @@
 						v-model="form.brandName"
 						:inputBorder="false"
 						text="right"
-						placeholder="请输入纸品品牌名称"
+						:maxlength="50"
+						placeholder="请输入品牌信息"
 					></qn-easyinput>
 				</view>
 			</view>
@@ -63,6 +65,7 @@
 					v-model="form.categoryName"
 					:inputBorder="false"
 					text="right"
+					:maxlength="50"
 					placeholder="请输入纸种信息"
 				></qn-easyinput>
 				<!-- categoryId -->
@@ -102,11 +105,12 @@
 					</view>
 					<view class="label_value">
 						<qn-easyinput
-							type="digit"
+							type="number"
 							:styles="{ disableColor: '#F7F8FA', borderBottom: '1px solid red' }"
 							v-model="item.weight"
 							:inputBorder="false"
 							text="right"
+							:maxlength="9999"
 							placeholder="请输入纸品克重"
 						></qn-easyinput>
 					</view>
@@ -191,7 +195,7 @@
 					file-mediatype="image"
 					mode="grid"
 					file-extname="png,jpg"
-					:limit="6"
+					:limit="5"
 					:image-styles="imageStyles"
 					@progress="progress"
 					@success="success"
@@ -214,7 +218,7 @@
 					v-model="form.sellingProposition"
 					:inputBorder="false"
 					type="textarea"
-					placeholder="请输入商品卖点"
+					placeholder="月结30天价格，不加服务费！"
 				></qn-easyinput>
 			</view>
 		</view>
@@ -230,7 +234,7 @@
 					v-model="form.description"
 					:inputBorder="false"
 					type="textarea"
-					placeholder="请输入商品描述"
+					placeholder="售价全部为含税价，支持先用后付，欢迎来电查询！近期价格波动较大，请下单前先咨询价格。"
 				></qn-easyinput>
 			</view>
 		</view>
@@ -245,7 +249,7 @@
 					v-model="form.shippingNote"
 					:inputBorder="false"
 					type="textarea"
-					placeholder="请输入送货说明"
+					placeholder="分切纸不足重量的，另加调机费；低于送货重量或超出送货范围的，运费另计。"
 				></qn-easyinput>
 			</view>
 		</view>
@@ -260,7 +264,7 @@
 					v-model="form.otherNote"
 					:inputBorder="false"
 					type="textarea"
-					placeholder="请输入其他说明"
+					placeholder="请输入"
 				></qn-easyinput>
 			</view>
 		</view>
@@ -333,16 +337,7 @@ export default {
 				}
 			],
 			paperList: [],
-			skuList: [
-				{
-					isPromoting: 0,
-					listPrice: null,
-					minimum: null,
-					stock: null,
-					stockUnit: '1',
-					weight: null
-				}
-			],
+			skuList: [],
 			imgList: [],
 			priceIndex: 0,
 			eidtFor: 0,
@@ -429,11 +424,11 @@ export default {
 		//新增售价
 		addPriceClick() {
 			this.skuList.push({
-				isPromoting: 0,
+				isPromoting: 1,
 				listPrice: null,
 				minimum: null,
 				stock: null,
-				stockUnit: '1',
+				stockUnit: '2',
 				weight: null,
 				categoryName: null
 			})
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 718ce5e..84e682e 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -41,7 +41,7 @@
 					<view class="other">
 						<view class="time">{{ item.updateTime }}</view>
 						<view class="btn">
-							<view class="" @click="editPaper(item)">编辑</view>
+							<view class="" @click="editPaper(item)"  v-if="item.status === 30112">编辑</view>
 							<view class="divide"></view>
 							<view class="" @click="productStatusChange(item)">{{ item.status === 30111 ? '下架' : '上架' }}</view>
 						</view>
diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue
index 1d6e693..53e7df4 100644
--- a/pages/submit-quotation/index.vue
+++ b/pages/submit-quotation/index.vue
@@ -41,7 +41,7 @@
 		<view class="submit-contant" v-for="(items, index) in upDataObj.itemList" :key="index">
 			<view class="submit-contant-head">
 				<view class="submit-contant-title">{{ items.paperName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }}</view>
-				<view class="" @click="commodityModify(items, index)"><image class="submit-image" src="../../static/imgs/trade/myPrice.png" mode=""></image></view>
+				<view class="" v-if="upDataObj.replyStatus !== 30102" @click="commodityModify(items, index)"><image class="submit-image" src="../../static/imgs/trade/myPrice.png" mode=""></image></view>
 			</view>
 			<view class="submit-contant-body">
 				<view class="">
@@ -52,7 +52,7 @@
 					<text class="submit-contant-body-title">单价(元/吨)：</text>
 					<text class="submit-contant-body-subtitle">
 						{{ items.unitFee }}
-						<image @click="priceModify(items, index)" class="submit-image-price" src="../../static/imgs/trade/myPrice.png" mode=""></image>
+						<image v-if="upDataObj.replyStatus !== 30102" @click="priceModify(items, index)" class="submit-image-price" src="../../static/imgs/trade/myPrice.png" mode=""></image>
 					</text>
 				</view>
 				<view>
@@ -80,7 +80,7 @@
 				<text class="submit-contant-time-title">有效时间：</text>
 				<text class="submit-contant-time-title">{{ upDataObj.enquiryValidTime }}</text>
 			</view>
-			<view class="" @click="resetTime()"><text class="submit-contant-time-subtitle">设置</text></view>
+			<view class="" v-if="upDataObj.replyStatus !== 30102" @click="resetTime()"><text class="submit-contant-time-subtitle">设置</text></view>
 		</view>
 		<uGap></uGap>
 		<view class="submit-contant-remark">
@@ -88,7 +88,7 @@
 			<view class=""><uni-easyinput maxlength="200" type="textarea" class="submit-contant-remark-input" v-model="value1" placeholder="请输入内容"></uni-easyinput></view>
 		</view>
 		<uGap></uGap>
-		<view class="submit-btnBg"><button class="submit-btn" type="primary" @click="updataQuery()">提交报价</button></view>
+		<view class="submit-btnBg" v-if="upDataObj.replyStatus !== 30102"><button class="submit-btn" type="primary" @click="updataQuery()">提交报价</button></view>
 		<view class="">
 			<uni-popup ref="popup" :mask-click="false">
 				<view class="submit-popup">
@@ -273,6 +273,7 @@ export default {
 						this.$set(this.upDataObj, 'enquiryValidTimeSplit', timeabs)
 						this.$set(this.upDataObj, 'otherFee', 0)
 						this.$set(this.upDataObj, 'totalAllPrice', 0)
+						this.priceFree()
 						console.log('this.upDataObj', res)
 					}
 				})
@@ -387,6 +388,8 @@ export default {
 			this.priceFree()
 		},
 		priceFree() {
+			this.upDataObj.totalAllPrice = 0
+			this.upDataObj.otherFee = 0
 			for (let i = 0; i < this.upDataObj.itemList.length; i++) {
 				var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice)
 				this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2)
diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue
index 91e730f..45eb2e4 100644
--- a/pages/trade/quotationList.vue
+++ b/pages/trade/quotationList.vue
@@ -46,7 +46,9 @@
               <text>报价截止：</text>
               <text>{{ item.enquiryValidTime }}</text>
             </view>
-            <view><button type="primary" class="offer-btn" @click="offerClick(item)">报价</button></view>
+            <view>
+				<button type="primary" class="offer-btn" @click="offerClick(item)">报价</button>
+			</view>
           </view>
         </view>
         <uGap></uGap>
@@ -93,7 +95,7 @@ export default {
       },
       pagination: {
         pageNum: 0, // 初始会执行一次下拉加载
-        pageSize: 10
+        pageSize: 20
       },
       list: []
     }