feat：订货单-涉及试样订单的功能{

a.子表展示是否为试样订单（审核--都能修改、审核详情&详情和编辑都是只读） b.卡片增加是否为试样订单以及筛选 c.详情&编辑&审核&审核详情-主表增加这个字段展示布尔值 }

feat：订货单-涉及试样订单的功能{
a.子表展示是否为试样订单（审核--都能修改、审核详情&详情和编辑都是只读） b.卡片增加是否为试样订单以及筛选 c.详情&编辑&审核&审核详情-主表增加这个字段展示布尔值 }
史婷婷
1 parent ef33197f
Showing 7 changed files with 141 additions and 3 deletions
.idea/workspace.xml
pages/order_list/approve.vue
pages/order_list/detail.vue
pages/order_list/index.vue
pages/order_list/modify.vue
pages/order_list/product.vue
pages/order_list/viewer.vue
--- a/.idea/workspace.xml
View file @dde2006
+++ b/.idea/workspace.xml
View file @dde2006
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="22e3db16-f3f9-44cc-b7ca-0b5f75df2820" name="Changes" comment="" />
+    <list default="true" id="22e3db16-f3f9-44cc-b7ca-0b5f75df2820" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/pages/order_list/approve.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/approve.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order_list/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/detail.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order_list/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order_list/modify.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/modify.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order_list/product.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/product.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order_list/viewer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/viewer.vue" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
--- a/pages/order_list/approve.vue
View file @dde2006
+++ b/pages/order_list/approve.vue
View file @dde2006
@@ -55,11 +55,16 @@
               <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
+          <uni-list-item title="是否为试样订单">
+            <template v-slot:footer>
+              <view class="readonly-text">{{ form.sampleOrder ? '是' : '否' }}</view>
+            </template>
+          </uni-list-item>
         </view>
         <!-- 产品 -->
         <view class="section2">
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
+          <Product mode="approve" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
             :orderDate="form.orderDate" />
         </view>
--- a/pages/order_list/detail.vue
View file @dde2006
+++ b/pages/order_list/detail.vue
View file @dde2006
@@ -27,6 +27,7 @@
           </view>
           <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view>
           <view class="row"><text class="label">是否冻结</text><text class="value">{{ form.freeze ? '是' : '否' }}</text></view>
+          <view class="row"><text class="label">是否为试样订单</text><text class="value">{{ form.sampleOrder ? '是' : '否' }}</text></view>
         </view>
         <!-- 产品 -->
--- a/pages/order_list/index.vue
View file @dde2006
+++ b/pages/order_list/index.vue
View file @dde2006
@@ -31,6 +31,7 @@
             <view class="info-row"><text>生产厂</text><text>{{ item.workshopName }}</text></view>
             <view class="info-row"><text>办事处</text><text>{{ item.deptName }}</text></view>
             <view class="info-row"><text>订货日期</text><text>{{ item.orderDate }}</text></view>
+            <view class="info-row"><text>是否为试样订单</text><text>{{ item.sampleOrder ? '是' : '否' }}</text></view>
           </view>
         </template>
       </CardList>
@@ -65,6 +66,12 @@
           </view>
           <view class="form-item">
+            <view class="label">是否为试样订单</view>
+            <uni-data-checkbox mode="tag" :multiple="false" :value-field="'value'" :text-field="'text'"
+              v-model="model.sampleOrder" @change="onSampleOrderChange" :localdata="sampleOrderOptions" />
+          </view>
+
+          <view class="form-item">
             <view class="label">订货日期</view>
             <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)" />
           </view>
@@ -103,6 +110,7 @@ export default {
       workshopOptions: [],
       statusOptions: [],
       examineStatusOptions: [],
+      sampleOrderOptions: [{ text: '是', value: 'true' }, { text: '否', value: 'false' }],
       query: {},
       extraParams: {},
       currentItems: []
@@ -202,6 +210,11 @@ export default {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.examineStatus = raw
     },
+    onSampleOrderChange(e) {
+      const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
+      console.log('onSampleOrderChange', raw, typeof raw)
+      this.filterForm.sampleOrder = raw;
+    },
     onWorkshopChange(e) {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.workshopId = raw
--- a/pages/order_list/modify.vue
View file @dde2006
+++ b/pages/order_list/modify.vue
View file @dde2006
@@ -54,6 +54,11 @@
               <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
+          <uni-list-item title="是否为试样订单">
+            <template v-slot:footer>
+              <view class="readonly-text">{{ form.sampleOrder ? '是' : '否' }}</view>
+            </template>
+          </uni-list-item>
         </view>
         <!-- 产品 -->
--- a/pages/order_list/product.vue
View file @dde2006
+++ b/pages/order_list/product.vue
View file @dde2006
@@ -93,6 +93,91 @@
             </view>
         </view>
+        <view v-else-if="mode === 'approve'" class="section">
+            <view v-for="(item, idx) in items" :key="'a-' + idx" class="block">
+                <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
+                <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
+                <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
+            
+                <view v-show="!item.collapsed">
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <view class="value value-spec">
+                            <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                            <view v-if="item.thickness" class="value-spec_box">
+                                <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
+                                </view>
+                            </view>
+                            <view v-if="item.width" class="value-spec_val p12">*</view>
+                            <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                            <view v-if="item.width" class="value-spec_box">
+                                <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}</view>
+                            </view>
+                            <view v-if="item.length" class="value-spec_val p12">*</view>
+                            <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                            <view v-if="item.length" class="value-spec_box">
+                                <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
+                    <view class="row" :class="{ 'noneStyle': !item.showSalesPrice }"><text
+                            class="label">数量kg</text><text class="value">{{ item.quantity }}</text>
+                    </view>
+                    <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text
+                            class="label">销售价格</text><text class="value">{{
+                                item.salesPrice }}</text></view>
+                    <uni-list class="edit-list">
+                        <uni-list-item class="amount-item">
+                            <template v-slot:body>
+                                <view class="item-title"><text>包装费</text></view>
+                            </template>
+                            <template v-slot:footer>
+                                <view class="amount-row">
+                                    <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
+                                        :inputBorder="false"
+                                        @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
+                                        @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
+                                    <text class="unit">元</text>
+                                </view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="发货日期">
+                            <template v-slot:footer>
+                                <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
+                                    @change="onDeliveryChange($event, item, idx)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="考核超协">
+                            <template v-slot:footer>
+                                <uni-easyinput :disabled="pageType === 'modify'"
+                                    v-model="item.assessmentExceedsAgreement"
+                                    :placeholder="pageType === 'modify' ? '' : '请输入考核超协'" :inputBorder="false" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item class="select-item" :class="String(item.sampleOrder) ? 'is-filled' : 'is-empty'" clickable
+                            @click="openSheet(idx)" :rightText="(item.sampleOrder ? '是' : '否') || '请选择'" showArrow>
+                            <template v-slot:body>
+                                <view class="item-title"><text>是否为试样订单</text></view>
+                            </template>
+                        </uni-list-item>
+                    </uni-list>
+                </view>
+
+                <view class="block-ops">
+                    <div class="toggle" @click="toggleItem(idx)">
+                        <image :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'"
+                            class="icon" />
+                        {{ item.collapsed ? '展开' : '收起' }}
+                    </div>
+                </view>
+            </view>
+        </view>
+
         <view v-else-if="mode === 'view'" class="view-list" v-show="!collapsedView">
             <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
@@ -135,6 +220,7 @@
                 </view>
                 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
                         }}</text></view>
+                <view class="row"><text class="label">是否为试样订单</text><text class="value">{{ item.sampleOrder ? '是' : '否' }}</text></view>
             </view>
             <view class="view-total">
                 <view class="head">合计</view>
@@ -144,12 +230,16 @@
             </view>
         </view>
+    <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
+        @confirm="onSheetConfirm" />
     </view>
 </template>
 <script>
 import { uuid } from '@/utils/uuid.js'
+import SingleSelectSheet from '@/components/single-select/index.vue'
 export default {
     name: 'Product',
+  components: { SingleSelectSheet },
     props: {
         title: { type: String, default: '' },
         mode: { type: String, default: 'add' },
@@ -163,6 +253,7 @@ export default {
         return {
             items: [],
             collapsedView: false,
+            sheet: { visible: false, title: '请选择', options: [], value: '', field: '' }
         }
     },
     computed: {
@@ -265,7 +356,22 @@ export default {
             const num = Number(v)
             if (isNaN(num) || num < 0) item[field] = '0'
             if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
-        }
+        },
+        openSheet(idx) {
+            const item = this.items[idx]
+            const options = [{ label: '是', value: true }, { label: '否', value: false }]
+            const current = item.sampleOrder
+            this.sheet = { visible: true, title: '是否为试样订单', options, idx, value: current }
+        },
+        onSheetConfirm({ value }) {
+            const idx = this.sheet.idx
+            if (idx > -1 && this.items[idx]) {
+                const item = this.items[idx]
+                item.sampleOrder = value
+                this.$set(this.items, idx, { ...item })
+            }
+            this.sheet.visible = false
+        },
     }
 }
 </script>
--- a/pages/order_list/viewer.vue
View file @dde2006
+++ b/pages/order_list/viewer.vue
View file @dde2006
@@ -16,6 +16,7 @@
           <view class="row"><text class="label">备货单位/人(生产标准)</text><text class="value">{{ form.stockUpCompanyName }}</text></view>
           <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text></view>
           <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view>
+          <view class="row"><text class="label">是否为试样订单</text><text class="value">{{ form.sampleOrder ? '是' : '否' }}</text></view>
         </view>
         <!-- 产品 -->