feat: 经销库存合同-新增&编辑&查看-产品是否为试样订单逻辑

史婷婷
1 parent c064cef3
Showing 2 changed files with 41 additions and 13 deletions
pages/contract_retail/detail.vue
pages/contract_retail/productRel.vue
--- a/pages/contract_retail/detail.vue
View file @88ca471
+++ b/pages/contract_retail/detail.vue
View file @88ca471
@@ -475,7 +475,8 @@ export default {
 }
 .label {
-    width: 310rpx;
+    max-width: 400rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
--- a/pages/contract_retail/productRel.vue
View file @88ca471
+++ b/pages/contract_retail/productRel.vue
View file @88ca471
@@ -16,7 +16,7 @@
         <view v-if="mode === 'add'" class="add-list">
             <view v-for="(item, idx) in items" :key="idx" class="block">
                 <uni-list v-show="item.collapsed">
-                    <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx)" :rightText="item.productName || '请选择产品名称'" showArrow>
+                    <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
                         <template v-slot:body>
                             <view class="item-title"><text>产品名称</text></view>
                         </template>
@@ -33,7 +33,7 @@
                     </uni-list-item>
                 </uni-list>
                 <uni-list v-show="!item.collapsed">
-                    <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx)" :rightText="item.productName || '请选择产品名称'" showArrow>
+                    <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
                         <template v-slot:body>
                             <view class="item-title"><text>产品名称</text></view>
                         </template>
@@ -132,6 +132,12 @@
                             <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item class="select-item" :class="typeof item.sampleOrder === 'boolean' ? 'is-filled' : 'is-empty'" clickable
+                        @click="openProductSheet(idx, 'sampleOrder')" :rightText="typeof item.sampleOrder === 'boolean' ? (item.sampleOrder ? '是' : '否') : '请选择'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>是否为试样订单</text></view>
+                        </template>
+                    </uni-list-item>
                 </uni-list>
                 <view class="block-ops">
                     <div class="del" @click="onRemove(idx)">
@@ -190,6 +196,7 @@
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
                 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
+                <view class="row"><text class="label">是否为试样订单</text><text class="value">{{ item.sampleOrder ? '是' : '否' }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -212,7 +219,7 @@ export default {
     return {
       items: [],
       collapsedView: false,
-      sheet: { visible: false, title: '请选择产品', options: [], value: '', idx: -1 }
+      sheet: { visible: false, title: '请选择产品', options: [], value: '', idx: -1, mode: 'product' }
     }
   },
   computed: {
@@ -261,7 +268,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: '' }
         },
         onNumberInput(idx, field) {
             const it = this.items[idx]
@@ -369,18 +376,38 @@ export default {
           const l = [item.length, item.lengthTolPos, item.lengthTolNeg].filter(Boolean).join('/')
           return [t, w, l].filter(Boolean).join(' × ')
         },
-        openProductSheet(idx) {
-            const opts = this.selectOptions
-            const current = this.items[idx] && this.items[idx].productId
-            const match = opts.find(o => o.value === current)
-            this.sheet = { ...this.sheet, visible: true, title: '请选择产品', options: opts, idx, value: match ? match.value : '' }
+        openProductSheet(idx, mode = 'product') {
+            let opts = []
+            let title = ''
+            let value = ''
+            const item = this.items[idx]
+
+            if (mode === 'product') {
+                opts = this.selectOptions
+                const current = item && item.productId
+                const match = opts.find(o => o.value === current)
+                value = match ? match.value : ''
+                title = '请选择产品'
+            } else if (mode === 'sampleOrder') {
+                opts = [{ label: '是', value: true }, { label: '否', value: false }]
+                value = item.sampleOrder
+                title = '是否为试样订单'
+            }
+
+            this.sheet = { ...this.sheet, visible: true, title, options: opts, idx, value, mode }
         },
         onProductConfirm({ value, label }) {
-            const idx = this.sheet.idx
+            const { idx, mode } = this.sheet
             const it = this.items[idx]
             if (!it) { this.sheet.visible = false; return }
-            it.productId = value
-            it.productName = label || ''
+
+            if (mode === 'product') {
+                it.productId = value
+                it.productName = label || ''
+            } else if (mode === 'sampleOrder') {
+                it.sampleOrder = value
+            }
+
             this.$set(this.items, idx, it)
             this.sheet.visible = false
             this.emitChange()