纸品名称的修改

pages/agent/order-detail/reserve-info/index.wxml

@@ -8,7 +8,7 @@
 		<view slot="title" class="text-gray">预约信息</view>
 		<view style="padding:24rpx 30rpx">
 			<view class="flex flex-justify text-sg">
-				<text class="text-black">纸品品类</text>
+				<text class="text-black">品类</text>
 				<text class="text-gray">{{orderInfo.paperCategoryName}}</text>
 			</view>
 			<view class="flex flex-justify text-sg" style="margin-top:20rpx">

pages/process/order-add/index.js

@@ -144,7 +144,7 @@ Scene({
       return
     }
     if(util.isEmpty(this.data.form.productId) || Number(this.data.form.productId) <= 0){
-      util.showToast('请选择纸品品类')
+      util.showToast('请选择收货品类')
       return
     }
     if(util.isEmpty(this.data.form.settleUnitPrice) || Number(this.data.form.settleUnitPrice) <= 0){

pages/process/order-add/index.wxml

@@ -40,9 +40,9 @@
   <view slot="title" class="flex flex-justify">
     <view class="flex flex-center text-black">
       <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
-      <text>废纸品类</text>
+      <text>收货品类</text>
     </view>
-    <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
+    <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择收货品类'}}</view>
   </view>
 </van-cell>
 <van-field id="settleUnitPrice" value="{{ form.settleUnitPrice || '' }}" type="digit" placeholder="{{form.konePrice || '请输入单价'}}" clearable input-align="right" bind:change="bindInput">

pages/process/order-check/index.js

@@ -130,7 +130,7 @@ Scene({
   },
   checkOrder: function(){
     if(util.isEmpty(this.data.form.productId) || Number(this.data.form.productId) <= 0){
-      util.showToast('请选择废纸品类')
+      util.showToast('请选择收货品类')
       return
     }
     if(util.isEmpty(this.data.form.unitPrice) || Number(this.data.form.unitPrice) <= 0){

pages/process/order-check/index.wxml

@@ -46,9 +46,9 @@
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
         <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
-        <text>废纸品类</text>
+        <text>收货品类</text>
       </view>
-      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
+      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择收货品类'}}</view>
     </view>
   </van-cell>
   <!-- <van-cell>

pages/process/order-info/index.wxml

@@ -56,7 +56,7 @@
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
-      <view class="text-black">废纸品类</view>
+      <view class="text-black">收货品类</view>
       <view class="text-gray">{{form.productName || '- -'}}</view>
     </view>
   </van-cell>

pages/process/order-price/index.js

@@ -151,7 +151,7 @@ Scene({
   },
   priceOrder: function(){
     if(util.isEmpty(this.data.form.productId) || Number(this.data.form.productId) <= 0){
-      util.showToast('请选择废纸品类')
+      util.showToast('请选择收货品类')
       return
     }
     if(util.isEmpty(this.data.form.unitPrice) || Number(this.data.form.unitPrice) <= 0){

pages/process/order-price/index.wxml

@@ -55,9 +55,9 @@
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
         <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
-        <text>废纸品类</text>
+        <text>收货品类</text>
       </view>
-      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
+      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择收货品类'}}</view>
     </view>
   </van-cell>
   <view class="flex flex-center bg-white margin-top" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">

pages/process/outside-add/index.js

@@ -114,7 +114,7 @@ Scene({
     }
     for (var index = 0; index < this.data.form.productCategoryInfos.length; index++) {
       if (this.data.form.productCategoryInfos[index].productId == nowItem.id && this.data.cateIndex != index){
-        util.showToast('纸品已经存在，请不要重复添加') 
+        util.showToast('该品类已经存在，请不要重复添加') 
         return
       }
     }

pages/process/outside-add/index.wxml

@@ -51,10 +51,10 @@
 </van-cell>
 <van-field label="辅助设备" value="{{ form.equipmentRemark }}" input-align="right" clearable bind:change="onChange" placeholder="请输入辅助设备(选填)" border="{{ false }}" />
 <view style="height:16rpx"></view>
-<!-- <van-index-anchor index="纸品信息" /> -->
+<!-- <van-index-anchor index="品类信息" /> -->
 <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
   <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
-  <view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
+  <view class="text-black text-sg text-bold" style="margin-left: 12rpx">品类信息</view>
 </view>
 <scroll-view scroll-y>
   <view wx:for="{{form.productCategoryInfos}}" wx:key="index">

pages/process/outside-check-item/index.js

@@ -28,7 +28,7 @@ Component({
       }
       for (var i = 0; i < this.data.form.productCategoryInfos.length; i++) {
         if (this.data.form.productCategoryInfos[i].productId == detail.id){
-          util.showToast('纸品已经存在，请不要重复添加')
+          util.showToast('该品类已经存在，请不要重复添加')
           return
         }
       }

pages/process/outside-check-item/index.wxml

@@ -4,9 +4,9 @@
 	<view slot="title" class="flex flex-justify">
 		<view class="flex flex-center text-black">
 			<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
-			<text>废纸品类{{index + 1}}</text>
+			<text>收货品类{{index + 1}}</text>
 		</view>
-		<view class="{{item.productCategoryName ? 'text-black' : 'text-gray'}}">{{item.productCategoryName || '请选择废纸品类'}}</view>
+		<view class="{{item.productCategoryName ? 'text-black' : 'text-gray'}}">{{item.productCategoryName || '请选择收货品类'}}</view>
 	</view>
 </van-cell>
 <!-- <van-cell>

pages/process/outside-check/index.js

@@ -71,7 +71,7 @@ Scene({
     if(this.data.form.onsideGrossWeight) {
       this.checkOrder()
     } else {
-      var message = '此订单没有厂内毛重数据，按照正常流程请刷卡过磅，获取厂内毛重数据，如果已经无法获取，请仔细查验纸品和相关数据，确定没有问题后，进行审核。'
+      var message = '此订单没有厂内毛重数据，按照正常流程请刷卡过磅，获取厂内毛重数据，如果已经无法获取，请仔细查验品类和相关数据，确定没有问题后，进行审核。'
       Dialog.confirm({ title: '温馨提示',  message, confirmButtonText: '确定审核' }).then(() => {
         this.checkOrder()
       })
@@ -91,7 +91,7 @@ Scene({
     for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) {
       const element = this.data.form.productCategoryInfos[index]
       if(util.isEmpty(element.settleUnitPrice) || Number(element.settleUnitPrice) <= 0){
-        util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价')
+        util.showToast('请输入第' + (index + 1) + '项收货品类结算单价')
         this.setData({ intoview: 'item' + index })
         return
       }
@@ -103,7 +103,7 @@ Scene({
         }
       }
       if(element.highestUnitPrice && Number(element.settleUnitPrice) > Number(element.highestUnitPrice)){
-        util.showToast('第' + (index + 1) + '项废纸品类单价不得高于：' + element.highestUnitPrice + '元/公斤')
+        util.showToast('第' + (index + 1) + '项收货品类单价不得高于：' + element.highestUnitPrice + '元/公斤')
         this.setData({ intoview: 'item' + index })
         return
       }

pages/process/outside-check/index.wxml

@@ -29,7 +29,7 @@
   <view style="height:16rpx"></view>
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
     <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
-    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
+    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">品类信息</view>
   </view>
   <view wx:for="{{form.productCategoryInfos}}" wx:key="index" id="item{{index}}">
     <outside-check-item form="{{form}}" item="{{item}}" index="{{index}}" list="{{paperList}}" bind:change="onProductChange"/>

pages/process/outside-info/index.wxml

@@ -124,13 +124,13 @@
   <view style="height:16rpx"></view>
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
     <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
-    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
+    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">品类信息</view>
   </view>
   <view wx:for="{{form.productCategoryInfos}}" wx:key="index">
     <view style="height:16rpx" wx:if="{{index != 0 }}"></view>
     <van-cell clickable center>
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">废纸品类{{index + 1}}</view>
+        <view class="text-black">收货品类{{index + 1}}</view>
         <view class="text-gray">{{item.productCategoryName || '- -'}}</view>
       </view>
     </van-cell>

pages/process/outside-item/index.wxml

@@ -2,8 +2,8 @@
 <view style="height:16rpx" wx:if="{{index != 0 }}"></view>
 <van-cell clickable center>
 	<view slot="title" class="flex flex-justify">
-		<view class="text-black">废纸品类{{index + 1}}</view>
-		<view class="{{item.productCategoryName ? 'text-black' : 'text-gray'}}">{{item.productCategoryName || '请选择废纸品类'}}</view>
+		<view class="text-black">收货品类{{index + 1}}</view>
+		<view class="{{item.productCategoryName ? 'text-black' : 'text-gray'}}">{{item.productCategoryName || '请选择收货品类'}}</view>
 	</view>
 </van-cell>
 <van-cell>

pages/process/outside-price/index.js

@@ -148,7 +148,7 @@ Scene({
     for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) {
       const element = this.data.form.productCategoryInfos[index]
       if(util.isEmpty(element.netWeight) || Number(element.netWeight) <= 0){
-        util.showToast('请输入第' + (index + 1) + '项废纸品类净重')
+        util.showToast('请输入第' + (index + 1) + '项收货品类净重')
         this.setData({ intoview: 'item' + index })
         return
       }
@@ -204,7 +204,7 @@ Scene({
     for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) {
       const element = this.data.form.productCategoryInfos[index]
       if(util.isEmpty(element.settleUnitPrice) || Number(element.settleUnitPrice) <= 0){
-        util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价')
+        util.showToast('请输入第' + (index + 1) + '项出货品类结算单价')
         return
       }
       var item = { productId: element.productId, scrapPaperPurchaseOrderId: element.scrapPaperPurchaseOrderId }

pages/process/outside-price/index.wxml

@@ -91,7 +91,7 @@
   <view style="height:16rpx"></view>
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
     <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
-    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
+    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">品类信息</view>
   </view>
   <view wx:for="{{form.productCategoryInfos}}" wx:key="index" id="item{{index}}">
     <outside-item item="{{item}}" index="{{index}}" status="{{form.orderStatus}}" bind:change="onProductChange"></outside-item>

pages/setting/paper-detial/index.js

@@ -55,7 +55,7 @@ Scene({
     this.data.form[e.currentTarget.id] = e.detail
   },
   deleteForm: function(e){
-    Dialog.confirm({ title: '温馨提示', message: '确定删除该纸品？' }).then(() => {
+    Dialog.confirm({ title: '温馨提示', message: '确定删除该品类？' }).then(() => {
       wx.showLoading({ title: '正在处理', mask: true })
       delePaperPrice(this.data.form.id).then(result => {
         wx.hideLoading()
@@ -70,11 +70,11 @@ Scene({
   },
   submitForm: function(e){
     if(util.isEmpty(this.data.form.categoryId)){
-      util.showToast('请选择一个纸品名称')
+      util.showToast('请选择一个品类名称')
       return
     }
     if(util.isEmpty(this.data.form.defaultUnitPrice) || Number(this.data.form.defaultUnitPrice) <= 0){
-      util.showToast('请输入纸品价格')
+      util.showToast('请输入品类指导价格')
       return
     }
     if(!util.isEmpty(this.data.form.highestUnitPrice)){

pages/setting/paper-list/index.wxml

@@ -16,7 +16,7 @@
       <view slot="title" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
         <view class="text-sg text-bold">{{item.productName || item.categoryName}}</view>
         <view class="text-sm text-gray" style="line-height: 28rpx">
-          <text>纸品单价(元/公斤)：{{item.defaultUnitPrice}}</text>
+          <text>品类单价(元/公斤)：{{item.defaultUnitPrice}}</text>
           <text wx:if="{{item.highestUnitPrice}}" style="margin-left: 32rpx">最高单价(元/公斤)：{{item.highestUnitPrice}}</text>
         </view>
       </view>

pages/storage/order-create/index.js

@@ -173,7 +173,7 @@ Scene({
       return
     }
     if(util.isEmpty(this.data.form.productName)){
-      util.showToast('请选择废纸品类')
+      util.showToast('请选择出货品类')
       return
     }
     if(util.isEmpty(this.data.form.plateNumber)){

pages/storage/order-create/index.wxml

@@ -30,12 +30,12 @@
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
         <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
-        <text>废纸品类</text>
+        <text>出货品类</text>
       </view>
-      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
+      <view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择出货品类'}}</view>
     </view>
   </van-cell>
-  <van-field id="packageQuantity" label="纸品包数" value="{{ form.packageQuantity || '' }}" type="number" placeholder="请输入纸品包数" clearable input-align="right" bind:change="bindInput"></van-field>
+  <van-field id="packageQuantity" label="品类包数" value="{{ form.packageQuantity || '' }}" type="number" placeholder="请输入品类包数" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-cell clickable is-link arrow-direction="down" center bind:click="showPlate">
     <view class="flex flex-justify text-black">
       <view class="flex flex-center text-black">

pages/storage/order-info/index.wxml

@@ -25,13 +25,13 @@
     </van-cell>
     <van-cell center>
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">废纸品类</view>
+        <view class="text-black">出货品类</view>
         <view class="text-gray">{{orderInfo.productName || ''}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{orderInfo.packageQuantity}}">
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">纸品包数</view>
+        <view class="text-black">包数</view>
         <view class="text-gray">{{orderInfo.packageQuantity || ''}}</view>
       </view>
     </van-cell>
@@ -130,7 +130,7 @@
     </view>
     <van-cell center>
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">纸品品类</view>
+        <view class="text-black">品类</view>
         <view class="text-gray">{{form.categoryName || ''}}</view>
       </view>
     </van-cell>
@@ -216,13 +216,13 @@
       </van-cell>
       <van-cell center>
         <view slot="title" class="flex flex-justify">
-          <view class="text-black">废纸品类</view>
+          <view class="text-black">出货品类</view>
           <view class="text-gray">{{orderInfo.productName || ''}}</view>
         </view>
       </van-cell>
       <van-cell wx:if="{{orderInfo.packageQuantity}}">
         <view slot="title" class="flex flex-justify">
-          <view class="text-black">纸品包数</view>
+          <view class="text-black">包数</view>
           <view class="text-gray">{{orderInfo.packageQuantity || ''}}</view>
         </view>
       </van-cell>

pages/storage/order-settlement/index.js

@@ -264,7 +264,7 @@ Scene({
   },
   settlementForm: function(){
     if(util.isEmpty(this.data.form.categoryId) || Number(this.data.form.categoryId) <= 0){
-      util.showToast('请选择废纸品类')
+      util.showToast('请选择出货品类')
       return
     }
     if(util.isEmpty(this.data.form.settleUnitPrice) || Number(this.data.form.settleUnitPrice) <= 0){

pages/storage/order-settlement/index.wxml

@@ -16,9 +16,9 @@
   <van-cell center required clickable is-link arrow-direction="down" bind:click="showCategory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <text>废纸品类</text>
+        <text>出货品类</text>
       </view>
-      <view class="{{form.categoryName ? 'text-black' : 'text-gray'}}">{{form.categoryName || '请选择废纸品类'}}</view>
+      <view class="{{form.categoryName ? 'text-black' : 'text-gray'}}">{{form.categoryName || '请选择出货品类'}}</view>
     </view>
   </van-cell>
   <van-field id="settleUnitPrice" required value="{{ form.settleUnitPrice || '' }}" type="digit" label="结算单价(元/吨)" title-width="240rpx" placeholder="{{form.konePrice || '请输入结算单价'}}" clearable input-align="right" bind:change="bindInput"></van-field>
@@ -59,13 +59,13 @@
     </van-cell>
     <van-cell center>
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">废纸品类</view>
+        <view class="text-black">出货品类</view>
         <view class="text-gray">{{orderInfo.productName || ''}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{orderInfo.packageQuantity}}">
       <view slot="title" class="flex flex-justify">
-        <view class="text-black">纸品包数</view>
+        <view class="text-black">包数</view>
         <view class="text-gray">{{orderInfo.packageQuantity || ''}}</view>
       </view>
     </van-cell>