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

@@ -94,6 +94,16 @@ export function createContractApi(data) {
   })
 }
 
+// 更新合同
+export function updateContractApi(data) {
+  return request({
+    url: `${baseUrl}/contractDistributorStandard`,
+    method: 'put',
+    data,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
 // 查看合同
 export function getContractApi(id) {
   return request({

@@ -231,6 +231,7 @@ export default {
                 includesTransportFee: false,
                 includesTransportFeeName: '',
                 unit: '元、公斤、元/公斤',
+                totalAmountCapital: '',
                 destinationId: [],
                 destinationLabel: ''
             },

@@ -14,7 +14,7 @@
                 </view>
 
                 <view class="section1">
-                    <ProductRel mode="view" :value="productList" />
+                    <ProductRel mode="view" :list="productList" />
                 </view>
 
                 <view class="section">

@@ -34,7 +34,7 @@
                     </template>
                 </uni-list-item>
 
-                <!-- <ProductRel mode="add" :orderDateBase="form.orderDate" v-model="productLineList" @change="onProductsChange" :options="productList" /> -->
+                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -196,7 +196,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getContractApi } from '@/api/contract'
+import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 
@@ -251,6 +251,7 @@ export default {
             sumAmountExcl: 0,
             sumTotal: 0,
             productLineList: [],
+            newProductLineList: [],
             productList: []
         }
     },
@@ -333,6 +334,7 @@ export default {
         },
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
+            this.newProductLineList = list
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
@@ -411,17 +413,66 @@ export default {
                 this.form.executionStandardRemarks = ''
             }
         },
+        validateRequired() {
+            const checks = [
+                { key: 'code', label: '编号' },
+                { key: 'supplier', label: '供方' },
+                { key: 'buyer', label: '需方' },
+                { key: 'orderDate', label: '订货日期' }
+            ]
+            for (const it of checks) {
+                const val = this.form[it.key]
+                const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
+                if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
+            }
+            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+                uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
+            }
+            for (const [idx, it] of this.productLineList.entries()) {
+                if (!it.productName || !it.quantity || !it.unitPrice) {
+                    uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
+                }
+            }
+            return true
+        },
         async onSubmit() {
-
-            const { destinationLabel, destinationId, ...formForSubmit } = this.form;
-            // 区id
-            const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
-            const payload = {
+            console.log('onSubmit__payload', payload)
+            if (!this.validateRequired()) return
+            const confirmRes = await new Promise(resolve => {
+                uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+            })
+            if (!(confirmRes && confirmRes.confirm)) return
+            const clean = (obj) => {
+                const out = {}
+                Object.keys(obj || {}).forEach(k => {
+                    const v = obj[k]
+                    const isEmptyString = typeof v === 'string' && v.trim() === ''
+                    const isUndef = v === undefined || v === null
+                    const isNaNNumber = typeof v === 'number' && isNaN(v)
+                    if (!(isEmptyString || isUndef || isNaNNumber)) out[k] = v
+                })
+                return out
+            }
+            const lines = (this.newProductLineList || []).map(it => clean(it))
+          const { destinationLabel, destinationId, ...formForSubmit } = this.form;
+          const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
+            const payload = clean({
                 ...formForSubmit,
+                id: this.form.id,
                 destination,
+                type: 'DISTRIB_STD',
+                sumQuantity: this.sumQuantity,
+                sumAmountExcl: this.sumAmountExcl,
+                sumTotal: this.sumTotal,
+                contractDistributorLineList: lines
+            })
+            try {
+                await updateContractApi(payload)
+                uni.showToast({ title: '保存成功', icon: 'none' })
+                setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
+            } catch (e) {
+                uni.showToast({ title: '提交失败', icon: 'none' })
             }
-            console.log('onSubmit__payload', payload)
-            uni.showToast({ title: '暂未接入保存接口', icon: 'none' })
         }
     }
 }

@@ -174,7 +174,7 @@ export default {
     name: 'ProductRel',
     props: {
         mode: { type: String, default: 'add' },
-        value: { type: Array, default: () => [] },
+        list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
         orderDateBase: { type: String, default: '' },
         options: { type: Array, default: () => [] }
@@ -201,22 +201,24 @@ export default {
       handler() { this.emitChange() },
       deep: true
     },
-    value: {
+    list: {
       handler(v) {
-        const arr = Array.isArray(v) ? v : []
-        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
+        // const arr = Array.isArray(v) ? v : []
+        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
+        this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
+        console.log('v', v)
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.value) && this.value.length > 0 ? this.value.map(v => ({ ...this.defaultItem(), ...v, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: 0, unitPrice: 0, amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
         },
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
@@ -235,7 +237,14 @@ export default {
         onNumberBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
-            const num = this.toNumber(it[field])
+            const raw = it[field]
+            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
+            if (raw === '' || raw === null || raw === undefined) {
+                this.$set(this.items, idx, it)
+                this.recalculate(idx)
+                return
+            }
+            const num = this.toNumber(raw)
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)