Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-23 b331ba531a81c3c60d26eba856b5b3905153aba8

 sub_pages/partner/delivery/delivery-detail.vue

@@ -185,6 +185,12 @@
                  return
               }
            }
            if (this.form.status == 'lack') {
               if (!this.form.pictureList || this.form.pictureList.length < 1) {
                  this.$message.showToast('未上传图片')
                  return
               }
            }
            if (this.form.status == 'replace' || this.form.status == 'lack') {
               if (isNaN(parseInt(this.form.num)) || this.form.num < 0) {
                  this.$message.showToast('数量需要大于等于0')
@@ -372,7 +378,7 @@
               <view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
            </view>
         </view>
		

      </view>

      <uni-popup ref="popup_form" type="top" :mask-click="false">
@@ -409,7 +415,7 @@
               </view>
               <view class="form-item" v-if="form.status==='reduce'">
                  <view class="form-item-label require">
                     扣款金额
                     扣款金额/每扎
                  </view>
                  <view class="form-item-value">
                     <input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
@@ -426,7 +432,7 @@
                     <input v-model="form.remarks" placeholder="请输入质检备注" class="form-input"></input>
                  </view>
               </view>
               <view class="form-item" v-if="form.status==='reduce'">
               <view class="form-item" v-if="form.status==='reduce'||form.status==='lack'">
                  <view class="form-item-label require">
                     图片
                  </view>
@@ -533,7 +539,7 @@
                  font-size: 24rpx;
                  color: #666666;
               }
					

               .label-color {
                  font-weight: 400;
                  font-size: 24rpx;
@@ -541,6 +547,7 @@
                  text-align: left;
                  padding-right: 10rpx;
               }

               .value-color {
                  font-weight: 400;
                  font-size: 24rpx;