Merge branch 'cjerp-2.0-fix' into test_cjerp

gesilong
2 parents 8c1172c2 b67d3ac9
Showing 4 changed files with 102 additions and 3 deletions
api/procure-manage/supplierQuotationProject.js
pages/supplier-price/add.vue
pages/supplier-price/detail.vue
pages/supplier-price/modify.vue
--- a/api/procure-manage/supplierQuotationProject.js
View file @1363992
+++ b/api/procure-manage/supplierQuotationProject.js
View file @1363992
@@ -56,3 +56,12 @@ export function supplierQuotationProjectUpdateStatusApi(params) {
     params
   })
 }
+
+// 获取供应商部门列表
+export function getSupplierDeptApi() {
+  return request({
+    url: '/system/dept/getChildDeptsByCode',
+    method: 'get',
+    params: { code: 'GYSBM' }
+  })
+}
--- a/pages/supplier-price/add.vue
View file @1363992
+++ b/pages/supplier-price/add.vue
View file @1363992
@@ -12,6 +12,14 @@
                     </template>
                 </uni-list-item>
+                <!-- 供应商部门 -->
+                <uni-list-item class="select-item" :class="form.supplierDepartmentId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSupplierDeptSheet" :rightText="form.supplierDepartmentName || '请选择供应商部门'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>供应商部门</text></view>
+                    </template>
+                </uni-list-item>
+
                 <!-- 品种 -->
                 <uni-list-item class="select-item" :class="form.productId ? 'is-filled' : 'is-empty'" clickable
                     @click="openProductSheet" :rightText="form.productName || '请选择品种'" showArrow>
@@ -92,7 +100,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
-import { supplierQuotationProjectSaveApi } from '@/api/procure-manage/supplierQuotationProject.js'
+import { supplierQuotationProjectSaveApi, getSupplierDeptApi } from '@/api/procure-manage/supplierQuotationProject.js'
 import { breedRelationshipQueryApi } from '@/api/procure-manage/salesmanQuotation.js'
 import { getDicByCodes } from '@/utils/dic.js'
@@ -103,6 +111,8 @@ export default {
         return {
             form: {
                 name: '',
+                supplierDepartmentId: '',
+                supplierDepartmentName: '',
                 productId: '',
                 productName: '',
                 quantity: '',
@@ -113,6 +123,7 @@ export default {
                 purchaseRule: ''
             },
             productList: [],
+            supplierDeptOptions: [],
             dictData: {},
             sheet: {
                 visible: false,
@@ -136,6 +147,7 @@ export default {
     onLoad() {
         this.loadDictData()
         this.loadProducts()
+        this.loadSupplierDeptList()
     },
     methods: {
         async loadDictData() {
@@ -150,6 +162,19 @@ export default {
             const data = this.dictData[dictCode]
             return (data && data.data) ? data.data : (Array.isArray(data) ? data : [])
         },
+        async loadSupplierDeptList() {
+            try {
+                const res = await getSupplierDeptApi()
+                const raw = res && res.data != null ? res.data : []
+                const list = Array.isArray(raw) ? raw : []
+                this.supplierDeptOptions = list.map(it => ({
+                    label: it.deptName || it.name || '',
+                    value: it.deptId || it.id || ''
+                }))
+            } catch (e) {
+                this.supplierDeptOptions = []
+            }
+        },
         async loadProducts() {
             try {
                 const res = await breedRelationshipQueryApi({ pageIndex: 1, pageSize: 9999 })
@@ -181,6 +206,19 @@ export default {
                 isDict: false
             }
         },
+        openSupplierDeptSheet() {
+            const opts = (this.supplierDeptOptions || []).map(p => ({ label: p.label, value: p.value }))
+            const cur = this.form.supplierDepartmentId
+            const match = opts.find(o => String(o.value) === String(cur))
+            this.sheet = {
+                visible: true,
+                title: '请选择供应商部门',
+                options: opts,
+                value: match ? match.value : '',
+                field: 'supplierDepartmentId',
+                isDict: false
+            }
+        },
         openDictSheet(field, dictCode, title) {
             const raw = this.getDictOptions(dictCode) || []
             const opts = raw.map(o => ({ label: o.name || o.label || '', value: o.code != null ? o.code : (o.value != null ? o.value : '') }))
@@ -203,6 +241,10 @@ export default {
                 const m = (this.productList || []).find(p => String(p.value) === String(value))
                 this.form.productName = m ? m.label : ''
             }
+            if (field === 'supplierDepartmentId') {
+                const m = (this.supplierDeptOptions || []).find(p => String(p.value) === String(value))
+                this.form.supplierDepartmentName = m ? m.label : ''
+            }
             // 切换项目类型时，若不再是集中开标则清空开标时间
             if (field === 'projectType' && !this.isConcentratedBid) {
                 this.form.bidTime = ''
@@ -281,6 +323,8 @@ export default {
             }
             const payload = clean({
                 name: this.form.name,
+                supplierDepartmentId: this.form.supplierDepartmentId,
+                supplierDepartmentName: this.form.supplierDepartmentName,
                 productId: this.form.productId,
                 productName: this.form.productName,
                 quantity: this.form.quantity,
--- a/pages/supplier-price/detail.vue
View file @1363992
+++ b/pages/supplier-price/detail.vue
View file @1363992
@@ -5,6 +5,7 @@
             <view class="section">
                 <text class="row company">{{ safeText(form.name) }}</text>
                 <view class="row"><text class="label">编号</text><text class="value">{{ safeText(form.code) }}</text></view>
+                <view class="row"><text class="label">供应商部门</text><text class="value">{{ safeText(form.supplierDepartmentName) }}</text></view>
                 <view class="row"><text class="label">品种</text><text class="value">{{ safeText(form.productName) }}</text></view>
                 <view class="row"><text class="label">数量（吨）</text><text class="value">{{ safeText(form.quantity) }}</text></view>
                 <view class="row"><text class="label">开始时间</text><text class="value">{{ formatDateTimeMinute(form.startTime) }}</text></view>
--- a/pages/supplier-price/modify.vue
View file @1363992
+++ b/pages/supplier-price/modify.vue
View file @1363992
@@ -12,6 +12,14 @@
                     </template>
                 </uni-list-item>
+                <!-- 供应商部门 -->
+                <uni-list-item class="select-item" :class="form.supplierDepartmentId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSupplierDeptSheet" :rightText="form.supplierDepartmentName || '请选择供应商部门'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>供应商部门</text></view>
+                    </template>
+                </uni-list-item>
+
                 <!-- 品种 -->
                 <uni-list-item class="select-item" :class="form.productId ? 'is-filled' : 'is-empty'" clickable
                     @click="openProductSheet" :rightText="form.productName || '请选择品种'" showArrow>
@@ -92,7 +100,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
-import { supplierQuotationProjectDetailApi, supplierQuotationProjectUpdateApi } from '@/api/procure-manage/supplierQuotationProject.js'
+import { supplierQuotationProjectDetailApi, supplierQuotationProjectUpdateApi, getSupplierDeptApi } from '@/api/procure-manage/supplierQuotationProject.js'
 import { breedRelationshipQueryApi } from '@/api/procure-manage/salesmanQuotation.js'
 import { getDicByCodes } from '@/utils/dic.js'
@@ -106,6 +114,8 @@ export default {
                 id: '',
                 name: '',
                 code: '',
+                supplierDepartmentId: '',
+                supplierDepartmentName: '',
                 productId: '',
                 productName: '',
                 quantity: '',
@@ -116,6 +126,7 @@ export default {
                 purchaseRule: ''
             },
             productList: [],
+            supplierDeptOptions: [],
             dictData: {},
             sheet: {
                 visible: false,
@@ -139,7 +150,9 @@ export default {
         this.id = (options && options.id) ? options.id : ''
         this.loadDictData().then(() => {
             this.loadProducts().then(() => {
-                if (this.id) this.loadDetail()
+                this.loadSupplierDeptList().then(() => {
+                    if (this.id) this.loadDetail()
+                })
             })
         })
     },
@@ -156,6 +169,19 @@ export default {
             const data = this.dictData[dictCode]
             return (data && data.data) ? data.data : (Array.isArray(data) ? data : [])
         },
+        async loadSupplierDeptList() {
+            try {
+                const res = await getSupplierDeptApi()
+                const raw = res && res.data != null ? res.data : []
+                const list = Array.isArray(raw) ? raw : []
+                this.supplierDeptOptions = list.map(it => ({
+                    label: it.deptName || it.name || '',
+                    value: it.deptId || it.id || ''
+                }))
+            } catch (e) {
+                this.supplierDeptOptions = []
+            }
+        },
         async loadProducts() {
             try {
                 const res = await breedRelationshipQueryApi({ pageIndex: 1, pageSize: 9999 })
@@ -187,6 +213,19 @@ export default {
                 isDict: false
             }
         },
+        openSupplierDeptSheet() {
+            const opts = (this.supplierDeptOptions || []).map(p => ({ label: p.label, value: p.value }))
+            const cur = this.form.supplierDepartmentId
+            const match = opts.find(o => String(o.value) === String(cur))
+            this.sheet = {
+                visible: true,
+                title: '请选择供应商部门',
+                options: opts,
+                value: match ? match.value : '',
+                field: 'supplierDepartmentId',
+                isDict: false
+            }
+        },
         openDictSheet(field, dictCode, title) {
             const raw = this.getDictOptions(dictCode) || []
             const opts = raw.map(o => ({ label: o.name || o.label || '', value: o.code != null ? o.code : (o.value != null ? o.value : '') }))
@@ -209,6 +248,10 @@ export default {
                 const m = (this.productList || []).find(p => String(p.value) === String(value))
                 this.form.productName = m ? m.label : ''
             }
+            if (field === 'supplierDepartmentId') {
+                const m = (this.supplierDeptOptions || []).find(p => String(p.value) === String(value))
+                this.form.supplierDepartmentName = m ? m.label : ''
+            }
             if (field === 'projectType' && !this.isConcentratedBid) {
                 this.form.bidTime = ''
             }
@@ -297,6 +340,8 @@ export default {
             const payload = clean({
                 id: this.form.id,
                 name: this.form.name,
+                supplierDepartmentId: this.form.supplierDepartmentId,
+                supplierDepartmentName: this.form.supplierDepartmentName,
                 productId: this.form.productId,
                 productName: this.form.productName,
                 quantity: this.form.quantity,