diff --git a/src/components/MyCustomerCompanyListCard/index.vue b/src/components/MyCustomerCompanyListCard/index.vue
index 0532a90..4caf872 100644
--- a/src/components/MyCustomerCompanyListCard/index.vue
+++ b/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>
diff --git a/src/views/contract/custom/index.vue b/src/views/contract/custom/index.vue
index cae502c..55c5766 100644
--- a/src/views/contract/custom/index.vue
+++ b/src/views/contract/custom/index.vue
@@ -1,114 +1,503 @@
 <template>
   <div class="common-list-contain">
     <div class="common-form">
-      <van-form ref="form" :show-error-message="false" validate-trigger="" :submit-on-enter="false">
-        <div class="section"> <span class="line"> </span> 审批内容</div>
+      <van-form
+        ref="form"
+        :show-error-message="false"
+        validate-trigger=""
+        :submit-on-enter="false"
+      >
+        <div class="section"><span class="line"> </span> 审批内容</div>
         <div class="trips-box">
           <div class="item-box">
-            <van-field v-model="form.contractNumber" :disabled="['edit','show'].includes(this.$route.query.type)" placeholder="请输入" :rules="[{ required: true, message: '请输入' }]" required label="合同编号" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.contractName" required placeholder="请输入" :disabled="disabled" :rules="[{ required: true, message: '请输入' }]" label="合同名称" clear-trigger="always" input-align="right" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled ||oaListIsDisabled" :class="form.startTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.startTime1" @click="handleDateShow('startTime')" label="合同开始时间" clear-trigger="always" input-align="right" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled ||oaListIsDisabled" :class="form.endTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.endTime1" @click="handleDateShow('endTime')" label="合同结束时间" clear-trigger="always" input-align="right" />
-            <RePick v-model="form.customerCompanyId" :disabled="disabled ||oaListIsDisabled " titleKey="companyName" idKey="id" label="客户名称" name="customerCompanyId" :list="supplierList" isRequrie isCell clearable />
-            <RePick v-model="form.departmentId" :disabled="disabled" label="签约部门" @change="handleChange" :name="`departmentId`" :list="userDeptTree" isRequrie isCascader isShowSearch title="签约部门" titleKey="name" isCell clearable />
-            <RePick v-model="form.signatoryId" :disabled="disabled" titleKey="nickname" idKey="id" label="签约人员" name="signatoryId" :list="signatoryList" isRequrie isCell clearable />
-            <RePick v-model="form.contractType" :disabled="disabled" titleKey="contractName" idKey="id" label="合同类型" name="contractType" :list="typeList" isRequrie isCell clearable />
-            <RePick v-model="form.projectId" :disabled="disabled" titleKey="projectName" idKey="id" label="所属项目" name="contractType" :list="projectList" isRequrie isCell clearable />
-            <van-field v-model="form.amount" :disabled="disabled ||oaListIsDisabled " type="number" name="amount" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.validatorMoney }]" label="合同总金额" />
-            <van-field label="是否收款" required name="isCollect" :disabled="disabled" input-align="right" :rules="[{ required:true, message: '请选择'  }]" label-width="9em">
+            <van-field
+              v-model="form.contractNumber"
+              :disabled="['edit', 'show'].includes(this.$route.query.type)"
+              placeholder="请输入"
+              :rules="[{ required: true, message: '请输入' }]"
+              required
+              label="合同编号"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <van-field
+              v-model="form.contractName"
+              required
+              placeholder="请输入"
+              :disabled="disabled"
+              :rules="[{ required: true, message: '请输入' }]"
+              label="合同名称"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <van-field
+              right-icon="arrow"
+              :rules="[{ required: true, message: '请选择' }]"
+              :disabled="disabled || oaListIsDisabled"
+              :class="form.startTime ? 'actived-disabled' : ''"
+              :name="`time`"
+              placeholder="请选择"
+              v-model="form.startTime1"
+              @click="handleDateShow('startTime')"
+              label="合同开始时间"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <van-field
+              right-icon="arrow"
+              :rules="[{ required: true, message: '请选择' }]"
+              :disabled="disabled || oaListIsDisabled"
+              :class="form.endTime ? 'actived-disabled' : ''"
+              :name="`time`"
+              placeholder="请选择"
+              v-model="form.endTime1"
+              @click="handleDateShow('endTime')"
+              label="合同结束时间"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <RePick
+              v-model="form.customerCompanyId"
+              :disabled="disabled || oaListIsDisabled"
+              titleKey="companyName"
+              idKey="id"
+              label="客户名称"
+              name="customerCompanyId"
+              :list="supplierList"
+              isRequrie
+              isCell
+              clearable
+            />
+            <RePick
+              v-model="form.departmentId"
+              :disabled="disabled"
+              label="签约部门"
+              @change="handleChange"
+              :name="`departmentId`"
+              :list="userDeptTree"
+              isRequrie
+              isCascader
+              isShowSearch
+              title="签约部门"
+              titleKey="name"
+              isCell
+              clearable
+            />
+            <RePick
+              v-model="form.signatoryId"
+              :disabled="disabled"
+              titleKey="nickname"
+              idKey="id"
+              label="签约人员"
+              name="signatoryId"
+              :list="signatoryList"
+              isRequrie
+              isCell
+              clearable
+            />
+            <RePick
+              v-model="form.contractType"
+              :disabled="disabled"
+              titleKey="contractName"
+              idKey="id"
+              label="合同类型"
+              name="contractType"
+              :list="typeList"
+              isRequrie
+              isCell
+              clearable
+            />
+            <RePick
+              v-model="form.projectId"
+              :disabled="disabled"
+              titleKey="projectName"
+              idKey="id"
+              label="所属项目"
+              name="contractType"
+              :list="projectList"
+              isRequrie
+              isCell
+              clearable
+            />
+            <van-field
+              v-model="form.amount"
+              :disabled="disabled || oaListIsDisabled"
+              type="number"
+              name="amount"
+              placeholder="请输入"
+              input-align="right"
+              required
+              :rules="[
+                {
+                  required: true,
+                  message: '格式错误',
+                  validator: VerifyFunc.validatorMoney
+                }
+              ]"
+              label="合同总金额"
+            />
+            <van-field
+              label="是否收款"
+              required
+              name="isCollect"
+              :disabled="disabled"
+              input-align="right"
+              :rules="[{ required: true, message: '请选择' }]"
+              label-width="9em"
+            >
               <template #input>
-                <van-radio-group v-model="form.isCollect" :disabled="disabled" direction="horizontal">
+                <van-radio-group
+                  v-model="form.isCollect"
+                  :disabled="disabled"
+                  direction="horizontal"
+                >
                   <van-radio :name="1">是</van-radio>
                   <van-radio :name="0">否</van-radio>
                 </van-radio-group>
               </template>
             </van-field>
-            <van-field v-model="form.managerPhone" :disabled="disabled" name="managerPhone" type="number" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.rePhone }]" label="经办人电话" />
+            <van-field
+              v-model="form.managerPhone"
+              :disabled="disabled"
+              name="managerPhone"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+              required
+              :rules="[
+                {
+                  required: true,
+                  message: '格式错误',
+                  validator: VerifyFunc.rePhone
+                }
+              ]"
+              label="经办人电话"
+            />
             <!-- <van-field v-model="form.receivedAmount" :disabled="disabled" name="receivedAmount" type="number" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.validatorMoney }]" label="付款金额" /> -->
 
+            <RePick
+              v-model="form.capitalSource"
+              :disabled="disabled"
+              titleKey="label"
+              idKey="value"
+              label="资金来源"
+              name="capitalSource"
+              :list="capitalSource"
+              isCell
+              clearable
+            />
+            <van-field
+              v-model="form.proposerPerson"
+              :disabled="disabled"
+              name="proposerPerson"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+              label="申请人"
+            />
+            <!--            <van-field v-model="form.taxAmount" :disabled="disabled" name="taxAmount" type="number" placeholder="请输入" input-align="right" label="合同金额(含税)" />-->
+            <van-field
+              right-icon="arrow"
+              :rules="[{ required: true, message: '请选择' }]"
+              :disabled="disabled"
+              :class="form.proposerTime ? 'actived-disabled' : ''"
+              :name="`time`"
+              placeholder="请选择"
+              v-model="form.proposerTime1"
+              @click="handleDateShow('proposerTime')"
+              label="申请时间"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <van-field
+              v-model="form.taxForeheads"
+              :disabled="disabled"
+              name="taxForeheads"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+              label="税额"
+            />
+            <van-field
+              v-model="form.taxRate"
+              :disabled="disabled"
+              name="taxRate"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+              label="税率"
+            />
+            <van-field
+              right-icon="arrow"
+              :rules="[{ required: true, message: '请选择' }]"
+              :disabled="disabled"
+              :class="form.dateSigning ? 'actived-disabled' : ''"
+              :name="`time`"
+              placeholder="请选择"
+              v-model="form.dateSigning1"
+              @click="handleDateShow('dateSigning')"
+              label="签订时间"
+              clear-trigger="always"
+              input-align="right"
+            />
+            <van-field
+              v-model="form.other"
+              :disabled="disabled"
+              name="reason"
+              autosize
+              rows="2"
+              label="合同描述"
+              required
+              :rules="[{ required: true, message: '请输入' }]"
+              clear-trigger="always"
+              input-align="right"
+              placeholder="请输入"
+              type="textarea"
+            />
 
-            <RePick v-model="form.capitalSource" :disabled="disabled" titleKey="label" idKey="value" label="资金来源" name="capitalSource" :list="capitalSource" isCell clearable />
-            <van-field v-model="form.proposerPerson" :disabled="disabled" name="proposerPerson" type="number" placeholder="请输入" input-align="right"  label="申请人" />
-<!--            <van-field v-model="form.taxAmount" :disabled="disabled" name="taxAmount" type="number" placeholder="请输入" input-align="right" label="合同金额(含税)" />-->
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled" :class="form.proposerTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.proposerTime1" @click="handleDateShow('proposerTime')" label="申请时间" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.taxForeheads" :disabled="disabled" name="taxForeheads" type="number" placeholder="请输入" input-align="right"  label="税额" />
-            <van-field v-model="form.taxRate" :disabled="disabled" name="taxRate" type="number" placeholder="请输入" input-align="right"  label="税率" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled" :class="form.dateSigning ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.dateSigning1" @click="handleDateShow('dateSigning')" label="签订时间" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.other" :disabled="disabled" name="reason" autosize rows="2" label="合同描述" required :rules="[{ required: true, message: '请输入' }]" clear-trigger="always" input-align="right" placeholder="请输入" type="textarea" />
-
-<!--          元素管理-->
-            <template v-for="(item,index) in form.fieldTemplateList">
-              <van-field v-if="item.type == '1'" :required="item.required" :rules="[{ message: `${item.label}不能为空`, required: item.required}]" v-model="item.value" :label="item.label" :disabled="disabled || oaListIsDisabled" :name="item.field" placeholder="请输入" input-align="right"></van-field>
-              <van-field v-if="item.type == '2'" :label="item.label" :required="item.required" :name="item.field" :disabled="disabled || oaListIsDisabled" input-align="right" :rules="[{ message: `${item.label}不能为空`, required: false}]" label-width="9em">
+            <!--          元素管理-->
+            <template v-for="(item, index) in form.fieldTemplateList">
+              <van-field
+                v-if="item.type == '1'"
+                :required="item.required"
+                :rules="[
+                  { message: `${item.label}不能为空`, required: item.required }
+                ]"
+                v-model="item.value"
+                :label="item.label"
+                :disabled="disabled || oaListIsDisabled"
+                :name="item.field"
+                placeholder="请输入"
+                input-align="right"
+              ></van-field>
+              <van-field
+                v-if="item.type == '2'"
+                :label="item.label"
+                :required="item.required"
+                :name="item.field"
+                :disabled="disabled || oaListIsDisabled"
+                input-align="right"
+                :rules="[{ message: `${item.label}不能为空`, required: false }]"
+                label-width="9em"
+              >
                 <template #input>
-                  <van-switch v-model="item.value" :disabled="disabled || oaListIsDisabled"/>
+                  <van-switch
+                    v-model="item.value"
+                    :disabled="disabled || oaListIsDisabled"
+                  />
                 </template>
               </van-field>
-              <van-field v-if="item.type == '3'" :required="item.required" right-icon="arrow" :rules="[{ message: `${item.label}不能为空`, required: item.required}]" :disabled="disabled || oaListIsDisabled" :class="item.value ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.fieldTemplateList[index][`${item.field}1`]" @click="handleDateShow(item.field,index)" :label="item.label" clear-trigger="always" input-align="right" />
-              <van-field v-if="item.type == '4'" :required="item.required" type="number" :rules="[{ message: `${item.label}不能为空`, required: item.required}]" v-model="item.value" :label="item.label" :disabled="disabled || oaListIsDisabled" :name="item.field" placeholder="请输入" input-align="right"></van-field>
-              <RePick v-if="item.type == '5'" :isRequrie="item.required" v-model="item.value" :disabled="disabled || oaListIsDisabled" titleKey="label" idKey="value" :label="item.label" :name="item.field" :list="item.map" isCell clearable />
-              <RePick v-if="item.type == '6'" :isRequrie="item.required" v-model="item.value" :disabled="disabled || oaListIsDisabled" titleKey="label" idKey="value" :label="item.label" :name="item.field" :list="item.map" multiple isCell clearable />
+              <van-field
+                v-if="item.type == '3'"
+                :required="item.required"
+                right-icon="arrow"
+                :rules="[
+                  { message: `${item.label}不能为空`, required: item.required }
+                ]"
+                :disabled="disabled || oaListIsDisabled"
+                :class="item.value ? 'actived-disabled' : ''"
+                :name="`time`"
+                placeholder="请选择"
+                v-model="form.fieldTemplateList[index][`${item.field}1`]"
+                @click="handleDateShow(item.field, index)"
+                :label="item.label"
+                clear-trigger="always"
+                input-align="right"
+              />
+              <van-field
+                v-if="item.type == '4'"
+                :required="item.required"
+                type="number"
+                :rules="[
+                  { message: `${item.label}不能为空`, required: item.required }
+                ]"
+                v-model="item.value"
+                :label="item.label"
+                :disabled="disabled || oaListIsDisabled"
+                :name="item.field"
+                placeholder="请输入"
+                input-align="right"
+              ></van-field>
+              <RePick
+                v-if="item.type == '5'"
+                :isRequrie="item.required"
+                v-model="item.value"
+                :disabled="disabled || oaListIsDisabled"
+                titleKey="label"
+                idKey="value"
+                :label="item.label"
+                :name="item.field"
+                :list="item.map"
+                isCell
+                clearable
+              />
+              <RePick
+                v-if="item.type == '6'"
+                :isRequrie="item.required"
+                v-model="item.value"
+                :disabled="disabled || oaListIsDisabled"
+                titleKey="label"
+                idKey="value"
+                :label="item.label"
+                :name="item.field"
+                :list="item.map"
+                multiple
+                isCell
+                clearable
+              />
             </template>
           </div>
         </div>
-        <div class="section mt5"> <span class="line"> </span>附件</div>
+        <div class="section mt5"><span class="line"> </span>附件</div>
         <div class="trips-box">
           <div class="item-box">
-            <UploadFile :typeStr="typeStr" @onConfirm="handleUpload" :fileList="fileList" />
+            <UploadFile
+              :typeStr="typeStr"
+              @onConfirm="handleUpload"
+              :fileList="fileList"
+            />
           </div>
         </div>
-        <div class="section mt5"> <span class="line"> </span>
-          <van-button type="info" size="small" :disabled="disabled || oaListIsDisabled" native-type="button" @click="handleAddPay" round>增加收款计划</van-button>
+        <div class="section mt5">
+          <span class="line"> </span>
+          <van-button
+            type="info"
+            size="small"
+            :disabled="disabled || oaListIsDisabled"
+            native-type="button"
+            @click="handleAddPay"
+            round
+            >增加收款计划</van-button
+          >
         </div>
-        <div class="section mt5"> <span class="line"> </span>收款计划</div>
+        <div class="section mt5"><span class="line"> </span>收款计划</div>
         <div class="trips-box">
-          <div class="item-box" v-for="(item,index) in oaReimburseFeeitemList" :key="index">
+          <div
+            class="item-box"
+            v-for="(item, index) in oaReimburseFeeitemList"
+            :key="index"
+          >
             <div class="oaList">
-              <div>
-                序号 {{index + 1}}
-              </div>
+              <div>序号 {{ index + 1 }}</div>
               <div @click="handleDelOa(index)">
-                <van-icon name="delete-o" size="20" :color="`${disabled || oaListIsDisabled ? '#c8c9cc' : ''}`" />
+                <van-icon
+                  name="delete-o"
+                  size="20"
+                  :color="`${disabled || oaListIsDisabled ? '#c8c9cc' : ''}`"
+                />
               </div>
             </div>
-            <van-field v-model="item.planTime" label="计划付款时间" :disabled="disabled || oaListIsDisabled" :class="disabled ? 'actived-disabled':''" placeholder="请选择" @click="handlePDateShow(item.planTime,index)" :right-icon="item.planTime ?  '' :'arrow' " input-align="right" readonly autosize rows="1" type="textarea">
+            <van-field
+              v-model="item.planTime"
+              label="计划付款时间"
+              :disabled="disabled || oaListIsDisabled"
+              :class="disabled ? 'actived-disabled' : ''"
+              placeholder="请选择"
+              @click="handlePDateShow(item.planTime, index)"
+              :right-icon="item.planTime ? '' : 'arrow'"
+              input-align="right"
+              readonly
+              autosize
+              rows="1"
+              type="textarea"
+            >
             </van-field>
-            <van-field v-model="item.planName" label="计划名称" :disabled="disabled || oaListIsDisabled" name="planName" placeholder="请输入" input-align="right">
+            <van-field
+              v-model="item.planName"
+              label="计划名称"
+              :disabled="disabled || oaListIsDisabled"
+              name="planName"
+              placeholder="请输入"
+              input-align="right"
+            >
             </van-field>
-            <van-field v-model="item.percentage" label="比例(数字)" :disabled="disabled || oaListIsDisabled" @blur="handleBulrPe($event,index)" name="percentage" type="number" placeholder="请输入" input-align="right">
+            <van-field
+              v-model="item.percentage"
+              label="比例(数字)"
+              :disabled="disabled || oaListIsDisabled"
+              @blur="handleBulrPe($event, index)"
+              name="percentage"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+            >
             </van-field>
-            <van-field v-model="item.actualAmount" name="actualAmount" :disabled="disabled || oaListIsDisabled" type="number" placeholder="请输入" input-align="right" label="实付金额" />
-            <van-field v-model="item.planMemo" label="备注" :disabled="disabled || oaListIsDisabled" name="planMemo" placeholder="请输入" input-align="right">
+            <van-field
+              v-model="item.actualAmount"
+              name="actualAmount"
+              :disabled="disabled || oaListIsDisabled"
+              type="number"
+              placeholder="请输入"
+              input-align="right"
+              label="实付金额"
+            />
+            <van-field
+              v-model="item.planMemo"
+              label="备注"
+              :disabled="disabled || oaListIsDisabled"
+              name="planMemo"
+              placeholder="请输入"
+              input-align="right"
+            >
             </van-field>
           </div>
         </div>
-        <div class="section mt5" v-if="['show'].includes(typeStr)"> <span class="line"> </span>审批流程</div>
-        <ApprovalProcess v-if="['show'].includes(typeStr)" :processInstanceId="form.processInstanceId" @onSetId="handleSetAccessId" />
-
+        <div class="section mt5" v-if="['show'].includes(typeStr)">
+          <span class="line"> </span>审批流程
+        </div>
+        <ApprovalProcess
+          v-if="['show'].includes(typeStr)"
+          :processInstanceId="form.processInstanceId"
+          @onSetId="handleSetAccessId"
+        />
       </van-form>
     </div>
-    <BottomBtn ref="BottomBtn" :isAuthorised="isAuthorised" @onBtConfirm="handleBtConfirm" :accessId="accessId" />
+    <BottomBtn
+      ref="BottomBtn"
+      :isAuthorised="isAuthorised"
+      @onBtConfirm="handleBtConfirm"
+      :accessId="accessId"
+    />
 
     <!--行程时间范围选择 -->
-    <van-calendar ref="vanCalendar" allow-same-day :maxDate="maxDate" v-model="dateShow" :min-date="minDate" :default-date="defaultDate" color="#0088FE" @confirm="handleDateSelect" />
+    <van-calendar
+      ref="vanCalendar"
+      allow-same-day
+      :maxDate="maxDate"
+      v-model="dateShow"
+      :min-date="minDate"
+      :default-date="defaultDate"
+      color="#0088FE"
+      @confirm="handleDateSelect"
+    />
     <!--预计付款时间选择 -->
-    <van-calendar ref="pVanCalendar" allow-same-day :maxDate="maxDate" v-model="palnTimeShow" :min-date="minDate" :default-date="pDefaultDate" color="#0088FE" @confirm="handlePlanDateSelect" />
-
+    <van-calendar
+      ref="pVanCalendar"
+      allow-same-day
+      :maxDate="maxDate"
+      v-model="palnTimeShow"
+      :min-date="minDate"
+      :default-date="pDefaultDate"
+      color="#0088FE"
+      @confirm="handlePlanDateSelect"
+    />
   </div>
 </template>
 
 <script>
-import dayjs from 'dayjs';
-import { createCustomerContract, getCustomerContract, getCustomerCompanyPage } from '@/api/bs/customerContract'
-import { listData } from "@/api/system/dict/data";
-import VerifyFunc from '@/utils/verify'
-import { getPaymentPlanPage } from "@/api/bs/paymentPlan";
+import dayjs from 'dayjs'
 import {
-  listUser,
-} from "@/api/system/user";
+  createCustomerContract,
+  getCustomerContract,
+  getCustomerCompanyPage
+} from '@/api/bs/customerContract'
+import { listData } from '@/api/system/dict/data'
+import VerifyFunc from '@/utils/verify'
+import { getPaymentPlanPage } from '@/api/bs/paymentPlan'
+import { listUser } from '@/api/system/user'
 import { Dialog } from 'vant'
-import {getCustomerContractTypeListAll} from "@/api/bs/contractType";
-import {getProjectPage} from "@/api/bs/project";
+import { getCustomerContractTypeListAll } from '@/api/bs/contractType'
+import { getProjectPage } from '@/api/bs/project'
 import { queryFieldTemplate } from '@/api/bs/template'
 export default {
   //import引入组件才能使用
@@ -118,7 +507,7 @@ export default {
     UploadFile: () => import('@/components/UploadFile'),
     RePick: () => import('@/components/ReComponents/RePick'),
     ApprovalProcess: () => import('@/components/ApprovalProcess'),
-    BottomBtn: () => import('@/components/BottomBtn'),
+    BottomBtn: () => import('@/components/BottomBtn')
   },
   // 计算属性
   computed: {
@@ -136,7 +525,7 @@ export default {
     },
     disabled() {
       return ['show'].includes(this.$route.query.type)
-    },
+    }
   },
   // 生命周期，创建完成时（可以访问当前this实例）
   created() {
@@ -144,9 +533,7 @@ export default {
     this.handleInitForm()
   },
   // 生命周期：挂载完成时（可以访问DOM元素）
-  mounted() {
-
-  },
+  mounted() {},
   data() {
     return {
       pIndex: 0,
@@ -157,8 +544,8 @@ export default {
       isRereset: false,
       VerifyFunc,
       typeList: [],
-      projectList:[],
-      capitalSource:[],
+      projectList: [],
+      capitalSource: [],
       signatoryList: [],
       departmentList: [],
       dayjs,
@@ -184,13 +571,13 @@ export default {
         managerPhone: null,
         receivedAmount: null,
         dealContent: null,
-        other: null,
+        other: null
       },
       oaReimburseFeeitemList: [],
-      dateType:'',
-      fieldType:'',
-      fieldTemplateList:[]
-    };
+      dateType: '',
+      fieldType: '',
+      fieldTemplateList: []
+    }
   },
 
   // 监听data中的数据变化
@@ -214,7 +601,7 @@ export default {
       }
       Dialog.confirm({
         title: '提示',
-        message: '你确定要删除吗?',
+        message: '你确定要删除吗?'
       }).then(() => {
         this.oaReimburseFeeitemList.splice(index, 1)
       })
@@ -222,7 +609,11 @@ export default {
     handleBulrPe(e, index) {
       let list = this.oaReimburseFeeitemList
       if (this.form.amount) {
-        this.$set(list[index], 'actualAmount', (this.form.amount * (Number(e.target.value) / 100)).toFixed(2))
+        this.$set(
+          list[index],
+          'actualAmount',
+          (this.form.amount * (Number(e.target.value) / 100)).toFixed(2)
+        )
       } else {
         this.$fm('输入合同金额,自动计算实付金额!')
       }
@@ -254,7 +645,7 @@ export default {
       this.oaReimburseFeeitemList = []
     },
     handleCtBlur(e) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         if (e.target.value) {
           this.$loading(false)
           getPaymentPlanPage({
@@ -263,53 +654,67 @@ export default {
             paymentType: 1,
             contractNumber: e.target.value,
             type: 1
-          }).then((res) => {
-            if (res.data && res.data.list.length) {
-              const { paymentPlanDetailDOList } = res.data.list[0]
-              this.oaReimburseFeeitemList = (paymentPlanDetailDOList || []).map(item => {
-                return {
-                  ...item,
-                  actualAmount: Math.floor(Number(item.actualAmount) * 100) / 100,
-                  planTime: dayjs(item.planTime).format('YYYY/MM/DD')
+          })
+            .then((res) => {
+              if (res.data && res.data.list.length) {
+                const { paymentPlanDetailDOList } = res.data.list[0]
+                this.oaReimburseFeeitemList = (
+                  paymentPlanDetailDOList || []
+                ).map((item) => {
+                  return {
+                    ...item,
+                    actualAmount:
+                      Math.floor(Number(item.actualAmount) * 100) / 100,
+                    planTime: dayjs(item.planTime).format('YYYY/MM/DD')
+                  }
+                })
+                if (this.oaReimburseFeeitemList.length) {
+                  this.oaListIsDisabled = true
                 }
-              })
-              if (this.oaReimburseFeeitemList.length) {
-                this.oaListIsDisabled = true
-              }
-              let obj = res.data && res.data.list.length ? res.data.list[0] : null
-              if (obj) {
-                const { startTime, endTime, customerCompanyId, actualAmount, managerPhone } = obj
-                this.form = {
-                  // ...this.form,
-                  contractNumber: this.form.contractNumber,
-                  contractName: null,
-                  contractType: null,
-                  isCollect: null,
-                  receivedAmount: null,
-                  dealContent: null,
-                  other: null,
-                  time: `${dayjs(startTime).format('YYYY-MM-DD')} ~ ${dayjs(endTime).format('YYYY-MM-DD')}`,
-                  date: [startTime, endTime],
-                  customerCompanyId: Number(customerCompanyId),
-                  amount: actualAmount,
-                  startTime,
-                  endTime,
-                  managerPhone,
+                let obj =
+                  res.data && res.data.list.length ? res.data.list[0] : null
+                if (obj) {
+                  const {
+                    startTime,
+                    endTime,
+                    customerCompanyId,
+                    actualAmount,
+                    managerPhone
+                  } = obj
+                  this.form = {
+                    // ...this.form,
+                    contractNumber: this.form.contractNumber,
+                    contractName: null,
+                    contractType: null,
+                    isCollect: null,
+                    receivedAmount: null,
+                    dealContent: null,
+                    other: null,
+                    time: `${dayjs(startTime).format('YYYY-MM-DD')} ~ ${dayjs(
+                      endTime
+                    ).format('YYYY-MM-DD')}`,
+                    date: [startTime, endTime],
+                    customerCompanyId: Number(customerCompanyId),
+                    amount: actualAmount,
+                    startTime,
+                    endTime,
+                    managerPhone
+                  }
                 }
+                this.$loading(false)
+              } else {
+                // this.handleResetForm()
+                this.$loading(false)
+                this.oaListIsDisabled = false
               }
-              this.$loading(false)
-            } else {
-              // this.handleResetForm()
+              resolve()
+            })
+            .catch(() => {
               this.$loading(false)
               this.oaListIsDisabled = false
-            }
-            resolve()
-          }).catch(() => {
-            this.$loading(false)
-            this.oaListIsDisabled = false
-            // this.handleResetForm()
-            resolve()
-          })
+              // this.handleResetForm()
+              resolve()
+            })
         } else {
           this.oaReimburseFeeitemList = []
           this.oaListIsDisabled = false
@@ -323,13 +728,15 @@ export default {
         listUser({
           pageNo: 1,
           pageSize: 100,
-          deptId: val,
+          deptId: val
         }).then((ns) => {
-          this.signatoryList = ns.data && ns.data.list || []
+          this.signatoryList = (ns.data && ns.data.list) || []
           this.signatoryList = this.signatoryList.map((item) => {
             return {
               ...item,
-              nickname: `${item.nickname} ${item.userNumber ? `(${item.userNumber})` : ''}`
+              nickname: `${item.nickname} ${
+                item.userNumber ? `(${item.userNumber})` : ''
+              }`
             }
           })
           if (!type) {
@@ -352,76 +759,97 @@ export default {
         return
       }
       this.$nextTick(() => {
-        this.$refs.form.validate().then(() => {
-          if (this.oaReimburseFeeitemList.length) {
-            let list = this.oaReimburseFeeitemList
-            for (let i = 0; i < list.length; i++) {
-              if (!(list[i].planTime && list[i].percentage && list[i].actualAmount)) {
-                // this.$modal.msgWarning(`该合同暂无付款输入有误！`)
-                if (!list[i].planTime) {
-                  return this.$fm('请选择预计付款时间!')
+        this.$refs.form
+          .validate()
+          .then(() => {
+            if (this.oaReimburseFeeitemList.length) {
+              let list = this.oaReimburseFeeitemList
+              for (let i = 0; i < list.length; i++) {
+                if (
+                  !(
+                    list[i].planTime &&
+                    list[i].percentage &&
+                    list[i].actualAmount
+                  )
+                ) {
+                  // this.$modal.msgWarning(`该合同暂无付款输入有误！`)
+                  if (!list[i].planTime) {
+                    return this.$fm('请选择预计付款时间!')
+                  }
+                  let numreg = /^[1-9]\d*$/
+                  if (
+                    !list[i].percentage ||
+                    !(list[i].percentage && numreg.test(list[i].percentage))
+                  ) {
+                    return this.$fm('比例仅支持整数!')
+                  }
+                  if (
+                    !list[i].actualAmount ||
+                    !(Number(list[i].actualAmount) > 0)
+                  ) {
+                    return this.$fm('实付金额输入有误!')
+                  }
                 }
-                let numreg = /^[1-9]\d*$/
-                if (!list[i].percentage || (!(list[i].percentage && (numreg.test(list[i].percentage))))) {
-                  return this.$fm('比例仅支持整数!')
+              }
+            }
+            // 添加/修改的提交
+            let newForm = {
+              // approvalBiddingIdList: this.form.supplierList.filter(item => item.isWin == 1).map(n => n.id),
+              ...this.form,
+              id: this.form.id,
+              status: key,
+              files: this.fileList,
+              oaReimburseFeeitemList: this.oaReimburseFeeitemList.map(
+                (item) => {
+                  return {
+                    ...item,
+                    planTime: dayjs(item.planTime).valueOf()
+                  }
                 }
-                if (!list[i].actualAmount || (!(Number(list[i].actualAmount) > 0))) {
-                  return this.$fm('实付金额输入有误!')
+              )
+              // proposerPerson:this.userInfo.id
+            }
+            this.$loading(true, 'form')
+            // this.handleCtBlur({
+            //   target: {
+            //     value: this.form.contractNumber
+            //   }
+            // }).then(() => {
+            if (!this.oaReimburseFeeitemList.length) {
+              this.$loading(false, 'form')
+              return this.$fm('暂无收款计划,无法提交!')
+            }
+            createCustomerContract(newForm)
+              .then((res) => {
+                this.$loading(false, 'form')
+                this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
+                if (['add'].includes(this.$route.query.type)) {
+                  this.$EventBus.$emit('handleResetLive', 'contract-myCustom')
                 }
-              }
+                history.back()
+              })
+              .catch(() => {
+                this.$loading(false, 'form')
+              })
+            // })
+          })
+          .catch((err) => {
+            console.log(err)
+            this.$loading(false, 'form')
+            if (err && err.length > 0 && err[0].name) {
+              const fieldElement = this.$refs.form.$el.querySelector(
+                `[name="${err[0].name}"]`
+              )
+              const fieldHeight = fieldElement && fieldElement.offsetHeight
+              const scrollHeight = fieldHeight + 50 // 假设添加了 50px 的额外高度
+              this.$refs.form.scrollToField(err[0].name, scrollHeight)
             }
-          }
-          // 添加/修改的提交
-          let newForm = {
-            // approvalBiddingIdList: this.form.supplierList.filter(item => item.isWin == 1).map(n => n.id),
-            ...this.form,
-            id: this.form.id,
-            status: key,
-            files: this.fileList,
-            oaReimburseFeeitemList: (this.oaReimburseFeeitemList).map(item => {
-              return {
-                ...item,
-                planTime: dayjs(item.planTime).valueOf()
+            if (err && err.length) {
+              if (err[0].name === 'managerPhone') {
+                return this.$fm('经办人手机号码错误!')
               }
-            }),
-            // proposerPerson:this.userInfo.id
-          }
-          this.$loading(true, 'form')
-          // this.handleCtBlur({
-          //   target: {
-          //     value: this.form.contractNumber
-          //   }
-          // }).then(() => {
-          if (!this.oaReimburseFeeitemList.length) {
-            this.$loading(false, 'form')
-            return this.$fm('暂无收款计划,无法提交!')
-          }
-          createCustomerContract(newForm).then((res) => {
-            this.$loading(false, 'form')
-            this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
-            if (['add'].includes(this.$route.query.type)) {
-              this.$EventBus.$emit('handleResetLive', 'contract-myCustom')
             }
-            history.back()
-          }).catch(() => {
-            this.$loading(false, 'form')
           })
-          // })
-        }).catch((err) => {
-          console.log(err)
-          this.$loading(false, 'form')
-          if (err && err.length > 0 && err[0].name) {
-            const fieldElement = this.$refs.form.$el.querySelector(`[name="${err[0].name}"]`);
-            const fieldHeight = fieldElement && fieldElement.offsetHeight;
-            const scrollHeight = fieldHeight + 50; // 假设添加了 50px 的额外高度
-            this.$refs.form.scrollToField(err[0].name, scrollHeight);
-          }
-          if (err && err.length) {
-            if (err[0].name === "managerPhone") {
-              return this.$fm('经办人手机号码错误!')
-            }
-          }
-        })
       })
     },
     handleInitForm() {
@@ -430,84 +858,121 @@ export default {
       this.typeStr = type
       if (id) {
         this.$loading(true, 'loadingSb')
-        getCustomerContract(id).then((res) => {
-          this.form = res.data || {};
-          this.form = {
-            ...this.form,
-            time: `${dayjs(this.form.startTime).format('YYYY-MM-DD')} ~ ${dayjs(this.form.endTime).format('YYYY-MM-DD')}`,
-            departmentId: Number(this.form.departmentId),
-            signatoryId: Number(this.form.signatoryId),
-            isCollect: Number(this.form.isCollect),
-          }
-          this.handleChange(this.form.departmentId, 1)
-          // this.handleCtBlur({
-          //   target: {
-          //     value: res.data.contractNumber
-          //   }
-          // })
-          // this.handleInitOaReimburseFeeitemList(res.data.contractNumber)
-          this.oaReimburseFeeitemList = this.form.oaReimburseFeeitemList || []
-          this.oaReimburseFeeitemList = this.oaReimburseFeeitemList.map((item) => {
-            return {
-              ...item,
-              planTime: dayjs(item.planTime).format('YYYY/MM/DD')
+        getCustomerContract(id)
+          .then((res) => {
+            this.form = res.data || {}
+            this.form = {
+              ...this.form,
+              time: `${dayjs(this.form.startTime).format(
+                'YYYY-MM-DD'
+              )} ~ ${dayjs(this.form.endTime).format('YYYY-MM-DD')}`,
+              departmentId: Number(this.form.departmentId),
+              signatoryId: Number(this.form.signatoryId),
+              isCollect: Number(this.form.isCollect)
             }
+            this.handleChange(this.form.departmentId, 1)
+            // this.handleCtBlur({
+            //   target: {
+            //     value: res.data.contractNumber
+            //   }
+            // })
+            // this.handleInitOaReimburseFeeitemList(res.data.contractNumber)
+            this.oaReimburseFeeitemList = this.form.oaReimburseFeeitemList || []
+            this.oaReimburseFeeitemList = this.oaReimburseFeeitemList.map(
+              (item) => {
+                return {
+                  ...item,
+                  planTime: dayjs(item.planTime).format('YYYY/MM/DD')
+                }
+              }
+            )
+            this.fileList = res.data.files || []
+            this.isAuthorised = res.data.isAuthorised
+            this.$nextTick(() => {
+              this.$refs.BottomBtn.handleFilterBtnList()
+            })
+            this.$set(
+              this.form,
+              'dateSigning1',
+              `${dayjs(this.form.dateSigning).format('YYYY/MM/DD')}`
+            )
+            this.$set(
+              this.form,
+              'proposerTime1',
+              `${dayjs(this.form.proposerTime).format('YYYY/MM/DD')}`
+            )
+            this.$set(
+              this.form,
+              'startTime1',
+              `${dayjs(this.form.startTime).format('YYYY/MM/DD')}`
+            )
+            this.$set(
+              this.form,
+              'endTime1',
+              `${dayjs(this.form.endTime).format('YYYY/MM/DD')}`
+            )
+            this.form.fieldTemplateList?.forEach(function (item, index) {
+              if (item.type == 3) {
+                _this.$set(
+                  item,
+                  `${item.field}1`,
+                  `${dayjs(Number(item.value)).format('YYYY/MM/DD')}`
+                )
+              }
+              if (item.type == 2) {
+                item.value = item.value ? Boolean(item.value) : false
+              }
+            })
+            console.log('this.form..', this.form)
           })
-          this.fileList = res.data.files || []
-          this.isAuthorised = res.data.isAuthorised
-          this.$nextTick(() => {
-            this.$refs.BottomBtn.handleFilterBtnList()
-          })
-          this.$set(this.form, 'dateSigning1', `${dayjs(this.form.dateSigning).format('YYYY/MM/DD')}`)
-          this.$set(this.form, 'proposerTime1', `${dayjs(this.form.proposerTime).format('YYYY/MM/DD')}`)
-          this.$set(this.form, 'startTime1', `${dayjs(this.form.startTime).format('YYYY/MM/DD')}`)
-          this.$set(this.form, 'endTime1', `${dayjs(this.form.endTime).format('YYYY/MM/DD')}`)
-          this.form.fieldTemplateList.forEach(function (item,index){
-            if(item.type == 3){
-              _this.$set(item, `${item.field}1`, `${dayjs(Number(item.value)).format('YYYY/MM/DD')}`)
-            }
-            if(item.type == 2){
-              item.value =item.value? Boolean(item.value):false
-            }
+          .finally(() => {
+            this.$loading(false, 'loadingSb')
           })
-          console.log('this.form..', this.form);
-        }).finally(() => {
-          this.$loading(false, 'loadingSb')
-        })
-      }else {
+      } else {
         queryFieldTemplate(1).then((res) => {
-          res.data.forEach(function (item){
-            if(item.type == 6){
-              item.value = item.value?item.value:[]
+          res.data.forEach(function (item) {
+            if (item.type == 6) {
+              item.value = item.value ? item.value : []
             }
           })
           this.fieldTemplateList = res.data
           this.$set(this.form, 'fieldTemplateList', res.data)
-        });
+        })
       }
     },
     handleNewConfirmPo(arr, index) {
       let nameArr = []
-      this.userList.forEach(element => {
+      this.userList.forEach((element) => {
         if (arr.includes(element.id)) {
           nameArr.push(element.nickname)
         }
-      });
+      })
       this.$set(this.form.expenseApplyTrips[index], 'tripPartners', arr)
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartnersName', nameArr.join('、'))
+      this.$set(
+        this.form.expenseApplyTrips[index],
+        'tripPartnersName',
+        nameArr.join('、')
+      )
       this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
     },
     handleConfirmPo(arr, index) {
-      let nameArr = this.form.expenseApplyTrips[index].tripPartnersName && this.form.expenseApplyTrips[index].tripPartnersName.split('、') || []
+      let nameArr =
+        (this.form.expenseApplyTrips[index].tripPartnersName &&
+          this.form.expenseApplyTrips[index].tripPartnersName.split('、')) ||
+        []
       let newArr = this.form.expenseApplyTrips[index].tripPartners || []
-      this.userList.forEach(element => {
+      this.userList.forEach((element) => {
         if (arr.includes(element.id)) {
           nameArr.push(element.nickname)
           newArr.push(element.id)
         }
-      });
+      })
       this.$set(this.form.expenseApplyTrips[index], 'tripPartners', newArr)
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartnersName', nameArr.join('、'))
+      this.$set(
+        this.form.expenseApplyTrips[index],
+        'tripPartnersName',
+        nameArr.join('、')
+      )
       this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
     },
     handlePoShow(index) {
@@ -516,10 +981,8 @@ export default {
         this.$set(this.form.expenseApplyTrips[index], 'type', 0)
         this.$set(this.form.expenseApplyTrips[index], 'isOpen', true)
       } else {
-
         this.$fm('请先添加同行人！')
       }
-
     },
     handlePoCancel(index) {
       this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
@@ -543,10 +1006,10 @@ export default {
         tripDay: undefined,
         tripType: null,
         tripPartners: [], // 出差同行人
-        tripPartnersName: "",
+        tripPartnersName: '',
         amount: undefined,
         isOpen: false,
-        type: 0,
+        type: 0
       })
     },
     handleInitList() {
@@ -561,76 +1024,99 @@ export default {
       // })
       getCustomerCompanyPage({
         pageNo: 1,
-        pageSize: 1000,
+        pageSize: 1000
       }).then((res) => {
         this.supplierList = res.data.list || []
-        console.log('supplierList...', this.supplierList);
+        console.log('supplierList...', this.supplierList)
       })
       getCustomerContractTypeListAll({
         type: 1
       }).then((res) => {
         this.typeList = res.data || []
       })
-      getProjectPage({type:1,pageNo: 1,
-        pageSize: 500}).then(res=>{
+      getProjectPage({ type: 1, pageNo: 1, pageSize: 500 }).then((res) => {
         this.projectList = res.data.list || []
       })
       listData({
         pageNo: 1,
         pageSize: 50,
-        dictType: "capital_source",
+        dictType: 'capital_source'
       }).then((res) => {
-        this.capitalSource = res.data.list || [];
-      });
+        this.capitalSource = res.data.list || []
+      })
     },
-    handleDateShow(dateType,type) {
+    handleDateShow(dateType, type) {
       let _this = this
       if (this.disabled) return
       _this.dateType = dateType
       _this.fieldType = type
-      if(type){
+      if (type) {
         _this.$nextTick(() => {
           let date = _this.form.fieldTemplateList[type][dateType] || ''
           _this.$refs.vanCalendar && _this.$refs.vanCalendar.reset()
           _this.dateShow = true
           if (date) {
-            let time = dayjs(Number(date)).format('YYYY/MM/DD');
+            let time = dayjs(Number(date)).format('YYYY/MM/DD')
             _this.defaultDate = new Date(time)
           }
         })
-      }else {
+      } else {
         _this.$nextTick(() => {
-          let date = dateType == 'dateSigning'?_this.form.dateSigning:dateType=='proposerTime'?_this.form.proposerTime:dateType=='startTime'?_this.form.startTime:dateType=='endTime'?_this.form.endTime:''
+          let date =
+            dateType == 'dateSigning'
+              ? _this.form.dateSigning
+              : dateType == 'proposerTime'
+              ? _this.form.proposerTime
+              : dateType == 'startTime'
+              ? _this.form.startTime
+              : dateType == 'endTime'
+              ? _this.form.endTime
+              : ''
           _this.$refs.vanCalendar && _this.$refs.vanCalendar.reset()
           _this.dateShow = true
           if (date) {
-            let time = dayjs(Number(date)).format('YYYY/MM/DD');
+            let time = dayjs(Number(date)).format('YYYY/MM/DD')
             _this.defaultDate = new Date(time)
           }
         })
       }
-
     },
     handleDateSelect(val) {
-      if(this.fieldType){
-        this.$set(this.form.fieldTemplateList[this.fieldType], `${this.dateType}1`, `${dayjs(val).format('YYYY/MM/DD')}`)
-        this.$set(this.form.fieldTemplateList[this.fieldType], 'value', `${dayjs(val).valueOf()}`)
+      if (this.fieldType) {
+        this.$set(
+          this.form.fieldTemplateList[this.fieldType],
+          `${this.dateType}1`,
+          `${dayjs(val).format('YYYY/MM/DD')}`
+        )
+        this.$set(
+          this.form.fieldTemplateList[this.fieldType],
+          'value',
+          `${dayjs(val).valueOf()}`
+        )
         this.dateShow = false
-        return;
+        return
       }
-      if(this.dateType == 'dateSigning'){
-        this.$set(this.form, 'dateSigning1', `${dayjs(val).format('YYYY/MM/DD')}`)
+      if (this.dateType == 'dateSigning') {
+        this.$set(
+          this.form,
+          'dateSigning1',
+          `${dayjs(val).format('YYYY/MM/DD')}`
+        )
         this.$set(this.form, 'dateSigning', `${dayjs(val).valueOf()}`)
       }
-      if(this.dateType == 'proposerTime'){
-        this.$set(this.form, 'proposerTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
+      if (this.dateType == 'proposerTime') {
+        this.$set(
+          this.form,
+          'proposerTime1',
+          `${dayjs(val).format('YYYY/MM/DD')}`
+        )
         this.$set(this.form, 'proposerTime', `${dayjs(val).valueOf()}`)
       }
-      if(this.dateType == 'startTime'){
+      if (this.dateType == 'startTime') {
         this.$set(this.form, 'startTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
         this.$set(this.form, 'startTime', `${dayjs(val).valueOf()}`)
       }
-      if(this.dateType == 'endTime'){
+      if (this.dateType == 'endTime') {
         this.$set(this.form, 'endTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
         this.$set(this.form, 'endTime', `${dayjs(val).valueOf()}`)
       }
@@ -639,35 +1125,59 @@ export default {
     handlePlanDateSelect(date) {
       if (date) {
         let num = this.oaReimburseFeeitemList.length - 1
-        let nextTime = (this.oaReimburseFeeitemList[this.pIndex + 1] || {}).planTime
-        let beforeTime = (this.oaReimburseFeeitemList[this.pIndex - 1] || {}).planTime
+        let nextTime = (this.oaReimburseFeeitemList[this.pIndex + 1] || {})
+          .planTime
+        let beforeTime = (this.oaReimburseFeeitemList[this.pIndex - 1] || {})
+          .planTime
         if (this.pIndex == 0 && nextTime) {
-          if (!(dayjs(nextTime).isAfter(date))) {
-            this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
+          if (!dayjs(nextTime).isAfter(date)) {
+            this.$set(
+              this.oaReimburseFeeitemList[this.pIndex],
+              'planTime',
+              null
+            )
             return this.$fm('当前预计收款时间必须在下一笔收款时间之前！')
           }
-        } else if (num == this.pIndex && beforeTime || beforeTime) {
-          if (!(dayjs(date).isAfter(beforeTime))) {
-            this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
+        } else if ((num == this.pIndex && beforeTime) || beforeTime) {
+          if (!dayjs(date).isAfter(beforeTime)) {
+            this.$set(
+              this.oaReimburseFeeitemList[this.pIndex],
+              'planTime',
+              null
+            )
             return this.$fm('当前预计收款时间必须在上一笔收款时间之后！')
           }
         } else {
           if (beforeTime && nextTime) {
-            if (!((dayjs(date).isAfter(beforeTime)) && (dayjs(nextTime).isAfter(date)))) {
-              this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
-              return this.$fm('当前预计收款时间必须在上一笔和下一笔收款时间之间！')
+            if (
+              !(
+                dayjs(date).isAfter(beforeTime) && dayjs(nextTime).isAfter(date)
+              )
+            ) {
+              this.$set(
+                this.oaReimburseFeeitemList[this.pIndex],
+                'planTime',
+                null
+              )
+              return this.$fm(
+                '当前预计收款时间必须在上一笔和下一笔收款时间之间！'
+              )
             }
           }
         }
-        this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', dayjs(date).format('YYYY/MM/DD'))
+        this.$set(
+          this.oaReimburseFeeitemList[this.pIndex],
+          'planTime',
+          dayjs(date).format('YYYY/MM/DD')
+        )
       } else {
         this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
       }
       this.palnTimeShow = false
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped lang="scss">
 @import '~@/assets/style/common/form.scss';
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/contract/customerCompany/index.vue b/src/views/contract/customerCompany/index.vue
index 9ee656c..8027b54 100644
--- a/src/views/contract/customerCompany/index.vue
+++ b/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
             />
diff --git a/src/views/contract/myGetPlan/components/UserList.vue b/src/views/contract/myGetPlan/components/UserList.vue
index e8453d7..46c520e 100644
--- a/src/views/contract/myGetPlan/components/UserList.vue
+++ b/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) {
diff --git a/src/views/contract/payPlan/index.vue b/src/views/contract/payPlan/index.vue
index 2f068ef..0946cb6 100644
--- a/src/views/contract/payPlan/index.vue
+++ b/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()