From 17a31beca2e92bbf800eee7ac25f4232f10a5680 Mon Sep 17 00:00:00 2001
From: jiangweiguo <1578967617@qq.com>
Date: Thu, 21 Nov 2024 16:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MySupplierListCard/index.vue   | 30 ++++++++---------
 .../MysupplierMsgListCard/index.vue           |  4 +--
 .../myPayPlan/components/UserList.vue         | 33 ++++++++++++-------
 src/views/contract/supplier/index.vue         | 24 ++++++++++++--
 src/views/contract/supplierMsg/index.vue      | 20 ++++++++---
 src/views/home/index.vue                      | 10 ++----
 6 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/src/components/MySupplierListCard/index.vue b/src/components/MySupplierListCard/index.vue
index 8d5e6a2..7d2dca2 100644
--- a/src/components/MySupplierListCard/index.vue
+++ b/src/components/MySupplierListCard/index.vue
@@ -58,14 +58,12 @@
               }}
             </div>
             <div style="margin-top: 0.3rem; color: #333">
-              <div
-                class="tags"
-                :style="`border: 1px solid ;color:#05A9FF;width: 6rem;`"
-              >
+              <div style="margin-top: 0.3rem; color: #333">
+                合同状态:
                 {{
                   getDictDataLabel(
-                    DICT_TYPE.SR_CT_TYPE,
-                    itemData.contractType
+                    DICT_TYPE.BS_EXPENSE_APPLY_STATUS,
+                    itemData.status
                   ) || '未知'
                 }}
               </div>
@@ -127,13 +125,13 @@ export default {
   props: {
     itemData: {
       required: true,
-      default: () => {},
-    },
+      default: () => {}
+    }
   },
   components: {},
   data() {
     return {
-      jumoStudentId: null,
+      jumoStudentId: null
     }
   },
   activated() {
@@ -145,7 +143,7 @@ export default {
   computed: {
     userInfo() {
       return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} })
-    },
+    }
   },
   methods: {
     handleMerge(id, status) {
@@ -160,7 +158,7 @@ export default {
       this.jumoStudentId = id
       this.$router.push({
         path: '/supplier',
-        query: { id, type: 'edit' },
+        query: { id, type: 'edit' }
       })
     },
     handleDel(id, status, creator) {
@@ -169,7 +167,7 @@ export default {
       }
       Dialog.confirm({
         title: '提示',
-        message: '你确定要删除吗?',
+        message: '你确定要删除吗?'
       }).then(() => {
         deleteSupplierContract(id).then(() => {
           this.$emit('onAllRefresh')
@@ -182,18 +180,18 @@ export default {
       this.jumoStudentId = id
       this.$router.push({
         path: '/supplier',
-        query: { id, type: 'show' },
+        query: { id, type: 'show' }
       })
     },
     dayjs,
     handleUpdataInfo() {
       this.jumoStudentId = null
       this.$emit('onUpdataInfo', this.itemData.id)
-    },
-  },
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '@/assets/style/common/newList.scss';
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/MysupplierMsgListCard/index.vue b/src/components/MysupplierMsgListCard/index.vue
index c13c1eb..11aad5f 100644
--- a/src/components/MysupplierMsgListCard/index.vue
+++ b/src/components/MysupplierMsgListCard/index.vue
@@ -49,9 +49,9 @@
                 getDictDataLabel(DICT_TYPE.GYS_LEVEL, itemData.gradeGys) || ''
               }}
             </div>
-            <div style="margin-top: 0.3rem; color: #333">
+            <!-- <div style="margin-top: 0.3rem; color: #333">
               采购员姓名：{{ itemData.purchaserName }}
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="box-rt">
diff --git a/src/views/contract/myPayPlan/components/UserList.vue b/src/views/contract/myPayPlan/components/UserList.vue
index f82669b..0c220fa 100644
--- a/src/views/contract/myPayPlan/components/UserList.vue
+++ b/src/views/contract/myPayPlan/components/UserList.vue
@@ -10,13 +10,25 @@
         clearable
         input-align="left"
       />
-      <van-field
+      <RePick
+        v-model="queryForm.supplierId"
+        titleKey="companyName"
+        idKey="id"
+        title="供应商名称"
+        :name="`supplierId`"
+        label="供应商名称"
+        :list="spList"
+        isCell
+        clearable
+        input-align="left"
+      />
+      <!-- <van-field
         v-model="queryForm.companyName"
         placeholder="请输入"
         label="供应商名称"
         clearable
         input-align="left"
-      />
+      /> -->
       <div
         style="display: flex; justify-content: space-around; margin-top: 10px"
       >
@@ -85,6 +97,7 @@
 <script>
 import { getScrollTop } from '@/utils'
 import { getMyPayPlanPage } from '@/api/bs/myPayPlan'
+import { getSupplierCompanyPage } from '@/api/bs/supplierMsg'
 import { getDictDatas } from '@/utils/dict'
 import { mapState } from 'vuex'
 import dayjs from 'dayjs'
@@ -94,8 +107,8 @@ export default {
   },
   components: {
     RMList: () => import('@/components/ReComponents/RMList'),
-    MyPayPlanListCard: () => import('@/components/MyPayPlanListCard')
-    // RePick: () => import('@/components/ReComponents/RePick')
+    MyPayPlanListCard: () => import('@/components/MyPayPlanListCard'),
+    RePick: () => import('@/components/ReComponents/RePick')
   },
   data() {
     return {
@@ -112,7 +125,7 @@ export default {
       // 搜索表单
       queryForm: {
         contractNumber: null,
-        companyName: null
+        supplierId: null
       }
     }
   },
@@ -165,7 +178,7 @@ export default {
     rstSearch() {
       this.queryForm = {
         contractNumber: null,
-        companyName: null
+        supplierId: null
       }
       this.handleInit()
     },
@@ -173,12 +186,10 @@ export default {
       history.back()
     },
     handleInitSpList() {
-      let queryParams = {
+      getSupplierCompanyPage({
         pageNo: 1,
-        pageSize: this.singlePageSize,
-        paymentType: 0
-      }
-      getMyPayPlanPage(queryParams).then((res) => {
+        pageSize: 1000
+      }).then((res) => {
         this.spList = res.data.list || []
       })
     },
diff --git a/src/views/contract/supplier/index.vue b/src/views/contract/supplier/index.vue
index 720d507..b76dcd2 100644
--- a/src/views/contract/supplier/index.vue
+++ b/src/views/contract/supplier/index.vue
@@ -778,6 +778,26 @@ export default {
     },
     handleChange(val, type) {
       if (val) {
+        listUser({
+          pageNo: 1,
+          pageSize: 100
+        }).then((response) => {
+          this.signatoryList = response.data.list || []
+          this.signatoryList = this.signatoryList.map((item) => {
+            return {
+              ...item,
+              nickname: `${item.nickname} ${
+                item.userNumber ? `(${item.userNumber})` : ''
+              }`
+            }
+          })
+        })
+      } else {
+        this.signatoryList = []
+        this.$set(this.form, 'signatoryId', null)
+      }
+
+      /* if (val) {
         listUser({
           pageNo: 1,
           pageSize: 100,
@@ -799,7 +819,7 @@ export default {
       } else {
         this.signatoryList = []
         this.$set(this.form, 'signatoryId', null)
-      }
+      } */
     },
     handleClear() {
       this.$set(this.form, 'time', null)
@@ -973,7 +993,7 @@ export default {
                 ? `${dayjs(this.form.endTime).format('YYYY/MM/DD')}`
                 : ''
             )
-            res.data.fieldTemplateList.forEach(function (item) {
+            res.data.fieldTemplateList?.forEach(function (item) {
               if (item.type == 3) {
                 _this.$set(
                   item,
diff --git a/src/views/contract/supplierMsg/index.vue b/src/views/contract/supplierMsg/index.vue
index 460af70..e18fa3c 100644
--- a/src/views/contract/supplierMsg/index.vue
+++ b/src/views/contract/supplierMsg/index.vue
@@ -48,7 +48,7 @@
               :disabled="disabled"
               label="供应商材料类别"
               label-width="8rem"
-              :list="gysTypeList"
+              :list="getDictDatas(DICT_TYPE.BS_MATERIAL_TYPE)"
               isCell
               clearable
             />
@@ -63,7 +63,7 @@
             <RePick
               v-model="form.companyType"
               titleKey="label"
-              idKey="id"
+              idKey="vaule"
               title="供应商类别"
               :name="`companyType`"
               :disabled="disabled"
@@ -237,7 +237,10 @@ export default {
       // 遮罩层
       loading: true,
       // 表单参数
-      form: {}
+      form: {
+        materialsType: '',
+        companyType: ''
+      }
     }
   },
   computed: {
@@ -251,6 +254,7 @@ export default {
       this.$loading(false)
       this.handleInitForm()
     })
+    console.log(this.getDictDatas(this.DICT_TYPE.BS_ENTERPRISEL_TYPE), 'pppp')
   },
   methods: {
     handleInitForm() {
@@ -258,16 +262,22 @@ export default {
       this.typeStr = type
       if (id) {
         getSupplierCompany(id).then((res) => {
+          res.data.materialsType = res.data.materialsType
+            ? String(res.data.materialsType)
+            : ''
+          res.data.companyType = res.data.companyType
+            ? String(res.data.companyType)
+            : ''
           this.form = {
             // list: res.data.bankVos,
             exitStatus: null,
             ...(res.data || {}),
             logo: res.data.files
           }
+          console.log(this.form.materialsType, 'this.form.materialsType')
           this.form.purchaserId = Number(this.form.purchaserId)
           this.form.gradeGys = String(this.form.gradeGys)
-          this.form.materialsType = String(this.form.materialsType)
-          this.form.companyType = String(this.form.companyType)
+          // this.form.companyType = String(this.form.companyType)
           this.form.validTime = this.form.validTime
             ? `${dayjs(this.form.validTime).format('YYYY/MM/DD')}`
             : ''
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 71ed258..1da38dd 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -203,14 +203,8 @@ export default {
           ],
           title: '审批'
         }, */
-        {
+        /* {
           row: [
-            /* {
-              route: '/mySupplier',
-              title: '供应商合同审批',
-              icon: 'friends-o',
-              show: this.permission_btns.includes('procurement:supplierCt:list')
-            }, */
             {
               route: '/myCustom',
               title: '客户合同审批',
@@ -243,7 +237,7 @@ export default {
             }
           ],
           title: '对公'
-        },
+        }, */
         /* {
           row: [
             {