Merge branch 'cjerp-1.0' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into cjerp-1.0

@@ -10,9 +10,12 @@ export const statusStyle = [
 
 export const statusMap = {
   '生产中': '#2BA471',
+  '审核通过': '#2BA471',
   '审核中': '#3D48A3',
   '已签收': '#E7E7E7',
+  '已取消': '#000',
   '已发货': '#D54941',
+  '已驳回': '#D54941',
 }
 
 const baseUrl = '/contract';
@@ -24,6 +27,15 @@ export function queryApi(params) {
     params
   })
 }
+//取消锁价无规格申请单申请
+export function cancelApi(id) {
+  return request({
+    url: `${baseUrl}/specLockDelayApplication/cancel`,
+    method: 'get',
+    params: { id }
+  })
+}
+
 // 查询锁价无规格申请单列表
 export function querySpecLockApi(params) {
   return request({

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -40,7 +40,7 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                 </uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"

@@ -134,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -205,6 +205,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -222,6 +223,21 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -108,7 +108,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (totalQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -134,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -205,6 +205,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -244,6 +245,23 @@ export default {
     this.items = init
     this.recalculateAll()
   },
+  computed: {
+    minDeliveryDate() {
+        const s = this.deliveryDate
+        if (!s) return ''
+        const parts = String(s).split('-')
+        const y = Number(parts[0])
+        const m = Number(parts[1])
+        const d = Number(parts[2])
+        if (!y || !m || !d) return ''
+        const dt = new Date(y, m - 1, d)
+        dt.setDate(dt.getDate() + 1)
+        const yy = dt.getFullYear()
+        const mm = String(dt.getMonth() + 1).padStart(2, '0')
+        const dd = String(dt.getDate() - 1).padStart(2, '0')
+        return `${yy}/${mm}/${dd}`
+        }
+  },
   methods: {
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -134,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -205,6 +205,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -222,6 +223,21 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -140,7 +140,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -213,6 +213,7 @@ export default {
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
         options: { type: Array, default: () => [] },
+        deliveryDate: { type: String, default: '' },
         rawToProdRatioList: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -230,14 +231,28 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.rawProductId)
       }))
-    }
-    ,
+    },
     ratioOptions() {
       const list = Array.isArray(this.rawToProdRatioList) ? this.rawToProdRatioList : []
       return list.map(o => ({
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.code)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate"  :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -200,6 +200,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -217,6 +218,21 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -200,6 +200,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -217,6 +218,22 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
       }))
+    },
+
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {

@@ -25,7 +25,7 @@
 
 <script>
 import DetailButtons from '@/components/detail-buttons/index.vue'
-import { getSpecDetailApi } from '@/api/contract.js'
+import { getSpecDetailApi, cancelApi } from '@/api/contract.js'
 
 export default {
   components: { DetailButtons },
@@ -35,14 +35,24 @@ export default {
       form: {
         id: '', contractCode: '', customerName: '', deptName: '', workshopName: '', contractType: '', contractDocumentDate: '', applicationCount: '', totalQuantity: '', specLockDate: '', delayReason: '', orderDate: ''
         
-      }
+      },
+      buttons: [
+        { text: '编辑', variant: 'outline', visible: true, event: 'edit' },
+        { text: '审核', variant: 'outline', visible: true, event: 'audit' },
+        { text: '审核详情', variant: 'outline', visible: true, event: 'auditDetail' },
+        { text: '取消', variant: 'danger', visible: true, event: 'cancel' },
+      ]
     }
   },
   computed: {
     displayButtons() {
+      const s = this.form.approvalStatus || false
+      const e = this.form.showExamine || false
       return [
-        // { text: '删除', variant: 'danger' },
-        { text: '编辑', variant: 'outline' }
+        { ...this.buttons[0], visible: (s === 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:modify')) },
+        { ...this.buttons[1], visible: (s === 'AUDIT' && e && this.$auth.hasPermi('contract-manage:unlocked-operation-application:approve')) },
+        { ...this.buttons[2], visible: (s !== 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:review')) },
+        { ...this.buttons[3], visible: (s === 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:cancel')) },
       ]
     }
   },
@@ -60,6 +70,7 @@ export default {
         const m = d || {}
         const yesNo = m.hasFrameworkAgreement === 'Y' || m.hasFrameworkAgreement === true
         this.form = {
+          ...res.data || {},
           id: m.id || '',
           contractCode: m.contractCode || '',
           customerName: m.customerName || (m.customer && m.customer.name) || '',
@@ -75,13 +86,52 @@ export default {
         }
       })
     },
+    onEdit() {
+      if (!this.form.id) return
+      uni.navigateTo({ url: `/pages/contract_unlocked_operation/modify?id=${this.form.id}` })
+    },
+    onAudit(id, type) {
+        const CACHE_KEY = 'sourceBusinessId'
+        // const TYPE = 'contractType'
+        // uni.setStorageSync(TYPE, type)
+        uni.setStorageSync(CACHE_KEY, id)
+        uni.navigateTo({ url: '/pages/flow/audit' })
+    },
+    onAuditDetail(id, type) {
+      console.log(id,'id')
+        const CACHE_KEY = 'sourceBusinessId'
+        // const TYPE = 'contractType'
+        // uni.setStorageSync(TYPE, type)
+        uni.setStorageSync(CACHE_KEY, id)
+        uni.navigateTo({ url: '/pages/flow/audit_detail' })
+    },
+    onCancel(id) {
+        uni.showModal({
+            title: '确认取消吗？',
+            success: (res) => {
+                if (res.confirm) {
+                    uni.showLoading({ title: '取消中...' })
+                    cancelApi(id).then(res => {
+                        uni.hideLoading()
+                        if (res.code === 200) {
+                            uni.showToast({ title: '取消成功' })
+                            this.loadDetail()
+                        } else {
+                            uni.showToast({ title: res.msg || '取消失败' })
+                        }
+                    })
+                }
+            }
+        })
+    },
     handleButtonClick(btn) {
-      if (btn && btn.text === '编辑') {
-        return uni.navigateTo({ url: `/pages/contract_unlocked_operation/modify?id=${this.id}` })
-      }
-      // if (btn && btn.text === '删除') {
-      //   uni.showToast({ title: '暂未接入删除接口', icon: 'none' })
-      // }
+      if (!btn || btn.disabled) return
+      if (typeof btn.onClick === 'function') return btn.onClick(this.form, btn.params)
+      const e = btn.event || ''
+      if (e === 'edit') return this.onEdit(btn && btn.params)
+      if (e === 'audit') return this.onAudit(this.form.id || '')
+      if (e === 'auditDetail') return this.onAuditDetail(this.form.id || '')
+      if (e === 'cancel') return this.onCancel(this.form.id || '')
     }
   }
 }

@@ -6,7 +6,7 @@
           cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search" @input="onSearchInput" />
         <view class="tool-icons">
           <!-- <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" /> -->
-          <!-- <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" /> -->
+          <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
 
@@ -39,22 +39,19 @@
       </card-list>
     </view>
     <!-- 筛选弹框 -->
-    <!-- <filter-modal :visible.sync="filterVisible" :value.sync="filterForm" title="筛选" @reset="onFilterReset"
+    <filter-modal :visible.sync="filterVisible" :value.sync="filterForm" title="筛选" @reset="onFilterReset"
       @confirm="onFilterConfirm">
       <template v-slot="{ model }">
         <view class="filter-form">
           <view class="form-item">
-            <view class="label">品种</view>
+            <view class="label">审核状态</view>
             <uni-data-checkbox mode="tag" :multiple="false" :value-field="'value'" :text-field="'text'"
-              v-model="model.materialTypeId" @change="onMaterialTypeChange" :localdata="materialTypeOptions" />
-          </view>
-          <view class="form-item">
-            <view class="label">授权截止时间</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+              v-model="model.approvalStatus" @change="onApprovalStatusChange" :localdata="auditStatusOptions" />
           </view>
+
         </view>
       </template>
-    </filter-modal> -->
+    </filter-modal>
   </view>
 </template>
 
@@ -74,13 +71,14 @@ export default {
       // 批量选择
       batchMode: false,
       // 给到 card 的筛选值
-      query: { materialTypeId: '', dateRange: [] },
+      query: { materialTypeId: '', dateRange: [], approvalStatus: '' },
       extraParams: {},
 
       // 筛选弹框
       filterVisible: false,
-      filterForm: { materialTypeId: '', dateRange: [] },
+      filterForm: { materialTypeId: '', dateRange: [], approvalStatus: '' },
       materialTypeOptions: [],
+      auditStatusOptions: [],
       statusMap
     }
 
@@ -93,6 +91,7 @@ export default {
   },
   created() {
     this.getProductVariety();
+    this.loadAuditStatusOptions();
   },
   // 页面触底兜底：当页面自身滚动到底部时，转调卡片组件加载更多
   onReachBottom() {
@@ -162,6 +161,9 @@ export default {
     },
     onFilterConfirm(payload) {
       // 合并筛选值
+      if ((payload.approvalStatus === '' || payload.approvalStatus == null) && this.filterForm.approvalStatus !== '') {
+        payload.approvalStatus = this.filterForm.approvalStatus
+      }
       this.query = { ...this.query, ...payload }
     },
     onMaterialTypeChange(e) {
@@ -198,6 +200,22 @@ export default {
         }))
       })
     },
+    async loadAuditStatusOptions() {
+      try {
+        const dicCodes = ['AUDIT_STATUS']
+        const results = await getDicByCodes(dicCodes)
+        const option = (results.AUDIT_STATUS && results.AUDIT_STATUS.data) || []
+        this.auditStatusOptions = option.map(it => ({ value: it.code, text: it.name }))
+      } catch (e) {
+        this.auditStatusOptions = []
+      }
+    },
+    onApprovalStatusChange(e) {
+      const raw = e && e.detail && e.detail.value !== undefined
+        ? e.detail.value
+        : (e && e.value !== undefined ? e.value : '')
+      this.filterForm.approvalStatus = raw
+    },
   }
 }
 </script>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>

@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker  :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -200,6 +200,7 @@ export default {
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -217,6 +218,21 @@ export default {
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {