优化2

src/components/MyCustomerCompanyListCard/index.vue

@@ -37,7 +37,7 @@
             <div style="margin-top: 0.3rem; color: #333">
               所属行业:
               {{
-                getDictDataLabel(DICT_TYPE.BS_INDUSTRY, itemData.meritoType) ||
+                getDictDataLabel(DICT_TYPE.PROJECT_TYPE, itemData.meritoType) ||
                 ''
               }}
             </div>

src/views/contract/customerCompany/index.vue

@@ -30,12 +30,12 @@
             <RePick
               v-model="form.meritoType"
               titleKey="label"
-              idKey="id"
+              idKey="value"
               title="所属行业"
               :name="`meritoType`"
               :disabled="disabled"
               label="所属行业"
-              :list="getDictDatas(DICT_TYPE.BS_INDUSTRY)"
+              :list="getDictDatas(DICT_TYPE.PROJECT_TYPE)"
               isCell
               clearable
             />

src/views/contract/myGetPlan/components/UserList.vue

@@ -16,20 +16,32 @@
         clearable
         input-align="left"
       />
-      <van-field
+      <!-- <van-field
         v-model="queryForm.contractName"
         placeholder="请输入"
         label="合同名称"
         clearable
         input-align="left"
+      /> -->
+      <RePick
+        v-model="queryForm.supplierId"
+        titleKey="companyName"
+        idKey="id"
+        title="客户名称"
+        :name="`supplierId`"
+        label="客户名称"
+        :list="cpList"
+        isCell
+        clearable
+        input-align="left"
       />
-      <van-field
+      <!-- <van-field
         v-model="queryForm.customerCompanyName"
         placeholder="请输入"
         label="客户名称"
         clearable
         input-align="left"
-      />
+      /> -->
       <div
         style="display: flex; justify-content: space-around; margin-top: 10px"
       >
@@ -97,7 +109,7 @@
 
 <script>
 import { getScrollTop } from '@/utils'
-
+import { getCustomerCompanyPage } from '@/api/bs/customerContract'
 import { getPaymentPlanPage } from '@/api/bs/myGetPlan'
 import { getDictDatas } from '@/utils/dict'
 import { mapState } from 'vuex'
@@ -120,6 +132,7 @@ export default {
       finished: false,
       tableList: [],
       spList: [],
+      cpList: [],
       listQuery: {
         pageNo: 1,
         pageSize: 10,
@@ -129,7 +142,7 @@ export default {
       queryForm: {
         contractNumber: null,
         contractName: null,
-        customerCompanyName: null
+        supplierId: null
       }
     }
   },
@@ -147,6 +160,7 @@ export default {
   },
   created() {
     this.handleInit()
+    this.handleInitSpList()
   },
   methods: {
     // 搜索
@@ -176,7 +190,7 @@ export default {
       this.queryForm = {
         contractNumber: null,
         contractName: null,
-        companyName: null
+        supplierId: null
       }
       this.handleInit()
     },
@@ -184,13 +198,19 @@ export default {
       history.back()
     },
     handleInitSpList() {
-      let queryParams = {
+      /* let queryParams = {
         pageNo: 1,
         pageSize: this.singlePageSize,
         paymentType: 1
       }
       getPaymentPlanPage(queryParams).then((res) => {
         this.spList = res.data.list || []
+      }), */
+      getCustomerCompanyPage({
+        pageNo: 1,
+        pageSize: 999
+      }).then((response) => {
+        this.cpList = response.data.list
       })
     },
     handleSetSingle(id) {

src/views/contract/payPlan/index.vue

@@ -9,7 +9,7 @@
       >
         <div class="trips-box">
           <div class="item-box">
-            <RePick
+            <!-- <RePick
               v-model="form.type"
               title="是否关联合同"
               :name="`type`"
@@ -22,8 +22,17 @@
               isCell
               clearable
               required
+            /> -->
+            <van-field
+              v-model="form.type"
+              required
+              placeholder="请输入"
+              :disabled="disabled"
+              :rules="[{ required: true, message: '请输入' }]"
+              label="是否关联合同"
+              clearable
+              input-align="right"
             />
-
             <van-field
               v-model="form.contractNumber"
               required
@@ -67,7 +76,15 @@
               input-align="right"
               required
             />
-            <RePick
+            <van-field
+              v-model="form.payMentStatus"
+              placeholder="请输入"
+              :disabled="disabled"
+              label="付款状态"
+              clearable
+              input-align="right"
+            />
+            <!-- <RePick
               v-model="form.payMentStatus"
               title="付款状态"
               :name="`payMentStatus`"
@@ -80,8 +97,16 @@
               isCell
               clearable
               required
+            /> -->
+            <van-field
+              v-model="form.invoiceStatus"
+              placeholder="请输入"
+              :disabled="disabled"
+              label="开票状态"
+              clearable
+              input-align="right"
             />
-            <RePick
+            <!-- <RePick
               v-model="form.invoiceStatus"
               title="开票状态"
               :name="`invoiceStatus`"
@@ -94,7 +119,7 @@
               isCell
               clearable
               required
-            />
+            /> -->
             <van-field
               v-model="form.managerPhone"
               placeholder="请输入"
@@ -288,6 +313,10 @@ export default {
           this.form = {
             ...(res.data || {})
           }
+          this.form.type = this.form.type == 1 ? '有合同' : '无合同'
+          this.form.invoiceStatus = this.form.type == 1 ? '已开票' : '未开票'
+          this.form.payMentStatus =
+            this.form.payMentStatus == 1 ? '已付款' : '未付款'
           if (this.form.startTime && this.form.endTime) {
             this.form.startEnd = `${dayjs(this.form.startTime).format(
               'YYYY/MM/DD'
@@ -295,10 +324,11 @@ export default {
           } else {
             this.form.startEnd = ''
           }
-
-          this.form.reviewTime = this.form.reviewTime
-            ? `${dayjs(this.form.reviewTime).format('YYYY/MM/DD')}`
-            : ''
+          if (this.form.paymentPlanDetailDOList[0].planTime) {
+            this.form.paymentPlanDetailDOList[0].planTime = dayjs(
+              this.form.paymentPlanDetailDOList[0].planTime
+            ).format('YYYY/MM/DD')
+          }
           this.isAuthorised = res.data.isAuthorised
           this.$nextTick(() => {
             this.$refs.BottomBtn.handleFilterBtnList()