修改bug

src/api/basicData/basicFeesDesc.js

@@ -1,5 +1,12 @@
 import request from '@/router/axios';
 
+export function getFeesList(data) {
+  return request({
+    url: '/api/blade-client/feesdesc/list-not-page',
+    method: 'get',
+    params: data
+  })
+}
 //客户类别列表查询
 export function customerList(data) {
   return request({

src/api/basicData/configuration.js

@@ -192,3 +192,10 @@ export function repealCancel(data) {
       data: data
     })
   }
+  export function genClient(data) {
+    return request({
+      url: '/api/blade-deliver-goods/delivery/submit',
+      method: 'post',
+      data: data
+    })
+  }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -511,6 +511,13 @@ export default {
             ]
           },
           {
+            label: "日期说明",
+            prop: "dateDesc",
+            type: "textarea",
+            minRows: 1,
+            span: 6,
+          },
+          {
             label: "币别",
             prop: "currency",
             span: 6,

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2,33 +2,20 @@
   <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          >返回列表
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
         </el-button>
       </div>
       <div class="add-customer-btn" v-if="showBut">
-        <el-button
-          type="primary"
-          size="small"
-          v-if="detailData.status == 1"
-          class="el-button--small-yh "
-          @click.stop="openEdit"
-          >编辑
+        <el-button type="primary" size="small" v-if="detailData.status == 1" class="el-button--small-yh "
+          @click.stop="openEdit">编辑
         </el-button>
         <el-dropdown style="margin-right: 8px;margin-left: 8px;">
           <el-button type="primary" size="small">
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              :disabled="form.status > 0"
-              @click.native="pleaseCheck"
-              >请核数据</el-dropdown-item
-            >
+            <el-dropdown-item :disabled="form.status > 0" @click.native="pleaseCheck">请核数据</el-dropdown-item>
             <el-dropdown-item disabled>审核进度</el-dropdown-item>
             <el-dropdown-item disabled>撤销请核</el-dropdown-item>
           </el-dropdown-menu>
@@ -38,12 +25,9 @@
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="generateBill" :disabled="!form.id"
-              >生成账单
+            <el-dropdown-item @click.native="generateBill" :disabled="!form.id">生成账单
             </el-dropdown-item>
-            <el-dropdown-item @click.native="viewBill" :disabled="!form.id"
-              >查看账单</el-dropdown-item
-            >
+            <el-dropdown-item @click.native="viewBill" :disabled="!form.id">查看账单</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-dropdown style="margin-right: 8px;">
@@ -51,634 +35,293 @@
             业务处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="saveSell"
-              >生成采购
+            <el-dropdown-item @click.native="saveSell">生成采购
             </el-dropdown-item>
-            <el-dropdown-item :disabled="!form.id" @click.native="copyDoc"
-              >复制单据</el-dropdown-item
-            >
+            <el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button
-          type="primary"
-          :disabled="disabled"
-          @click="editCustomer"
-          :loading="subLoading"
-          v-if="detailData.status != 1"
-          size="small"
-          >保存数据
+        <el-button type="primary" :disabled="disabled" @click="editCustomer" :loading="subLoading"
+          v-if="detailData.status != 1" size="small">保存数据
         </el-button>
       </div>
     </div>
     <div class="customer-main">
       <trade-card title="基础信息">
-        <avue-form
-          ref="form"
-          class="trading-form"
-          v-model="form"
-          :option="option"
-        >
+        <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="portOfLoad">
-            <port-info
-              v-model="form.portOfLoad"
-              :disabled="detailData.status == 1"
-            />
+            <port-info v-model="form.portOfLoad" :disabled="detailData.status == 1" />
           </template>
           <template slot="portOfDestination">
-            <port-info
-              v-model="form.portOfDestination"
-              :disabled="detailData.status == 1"
-            />
+            <port-info v-model="form.portOfDestination" :disabled="detailData.status == 1" />
           </template>
           <template slot="corpId">
-            <crop-select
-              v-model="form.corpId"
-              @getCorpData="getCorpData"
-              corpType="KH"
-              :disabled="detailData.status == 1"
-            ></crop-select>
+            <crop-select v-model="form.corpId" @getCorpData="getCorpData" corpType="KH"
+              :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="belongToCorpId">
-            <crop-select
-              v-model="form.belongToCorpId"
-              corpType="GS"
-              :disabled="detailData.status == 1"
-            ></crop-select>
+            <crop-select v-model="form.belongToCorpId" corpType="GS" :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="corpAttn">
-            <el-select
-              size="small"
-              v-model="form.corpAttn"
-              placeholder="请选择"
-              @change="corpAttnChange"
-              clearable
-              :disabled="detailData.status == 1"
-            >
-              <el-option
-                v-for="item in corpsattns"
-                :key="item.id"
-                :label="item.cname"
-                :value="item.cname"
-              >
+            <el-select size="small" v-model="form.corpAttn" placeholder="请选择" @change="corpAttnChange" clearable
+              :disabled="detailData.status == 1">
+              <el-option v-for="item in corpsattns" :key="item.id" :label="item.cname" :value="item.cname">
               </el-option>
             </el-select>
           </template>
           <template slot="priceTerms">
-            <el-select
-              size="small"
-              v-model="form.priceTerms"
-              placeholder="请选择"
-              @change="priceTermsChange"
-              clearable
-              :disabled="detailData.status == 1"
-            >
-              <el-option
-                v-for="item in priceTermsList"
-                :key="item.id"
-                :label="item.dictValue"
-                :value="item.dictValue"
-              >
+            <el-select size="small" v-model="form.priceTerms" placeholder="请选择" @change="priceTermsChange" clearable
+              :disabled="detailData.status == 1">
+              <el-option v-for="item in priceTermsList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
               </el-option>
             </el-select>
           </template>
           <template slot="paymentType">
-            <el-select
-              size="small"
-              v-model="form.paymentType"
-              placeholder="请选择"
-              @change="paymentTypeChange"
-              clearable
-              :disabled="detailData.status == 1"
-            >
-              <el-option
-                v-for="item in paymentTermList"
-                :key="item.id"
-                :label="item.dictValue"
-                :value="item.dictValue"
-              >
+            <el-select size="small" v-model="form.paymentType" placeholder="请选择" @change="paymentTypeChange" clearable
+              :disabled="detailData.status == 1">
+              <el-option v-for="item in paymentTermList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
               </el-option>
             </el-select>
           </template>
           <template slot="businesDate">
-            <el-date-picker
-              v-model="form.businesDate"
-              type="date"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd 00:00:00"
-              @change="businesDateChange"
-              :disabled="detailData.status == 1"
-            >
+            <el-date-picker v-model="form.businesDate" type="date" format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd 00:00:00" @change="businesDateChange" :disabled="detailData.status == 1">
             </el-date-picker>
           </template>
           <template slot="currency">
-            <el-select
-              size="small"
-              v-model="form.currency"
-              placeholder="请选择"
-              @change="currencyChange"
-              :disabled="detailData.status == 1"
-              clearable
-            >
-              <el-option
-                v-for="item in currencyList"
-                :key="item.id"
-                :label="item"
-                :value="item"
-              >
+            <el-select size="small" v-model="form.currency" placeholder="请选择" @change="currencyChange"
+              :disabled="detailData.status == 1" clearable>
+              <el-option v-for="item in currencyList" :key="item.id" :label="item" :value="item">
               </el-option>
             </el-select>
           </template>
           <template slot="exchangeRate">
-            <el-input
-              size="small"
-              v-model="form.exchangeRate"
+            <el-input size="small" v-model="form.exchangeRate"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 汇率"
-              :disabled="detailData.status == 1"
-              @change="exchangeRateChange"
-            />
+              placeholder="请输入 汇率" :disabled="detailData.status == 1" @change="exchangeRateChange" />
           </template>
           <template slot="boxPile">
-            <el-select
-              size="small"
-              v-model="form.boxPile"
-              placeholder="请选择"
-              clearable
-              filterable
-              :disabled="detailData.status == 1"
-            >
-              <el-option
-                v-for="item in allBoxs"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-              >
+            <el-select size="small" v-model="form.boxPile" placeholder="请选择" clearable filterable
+              :disabled="detailData.status == 1">
+              <el-option v-for="item in allBoxs" :key="item.id" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
           </template>
           <template slot="boxNumber">
-            <el-input
-              size="mini"
-              v-model="form.boxNumber"
+            <el-input size="mini" v-model="form.boxNumber"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 箱量"
-              :disabled="detailData.status == 1"
-            />
+              placeholder="请输入 箱量" :disabled="detailData.status == 1" />
           </template>
           <template slot="minOrder">
-            <el-input
-              size="mini"
-              v-model="form.minOrder"
+            <el-input size="mini" v-model="form.minOrder"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 起订量"
-              :disabled="detailData.status == 1"
-            />
+              placeholder="请输入 起订量" :disabled="detailData.status == 1" />
           </template>
           <template slot="predictOceanFreight">
-            <el-input
-              size="mini"
-              v-model="form.predictOceanFreight"
+            <el-input size="mini" v-model="form.predictOceanFreight"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 预计海运费"
-              :disabled="detailData.status == 1"
-            />
+              placeholder="请输入 预计海运费" :disabled="detailData.status == 1" />
           </template>
           <template slot="referenceOceanFreight">
-            <el-input
-              size="mini"
-              v-model="form.referenceOceanFreight"
+            <el-input size="mini" v-model="form.referenceOceanFreight"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 参考海运费"
-              :disabled="detailData.status == 1"
-            />
+              placeholder="请输入 参考海运费" :disabled="detailData.status == 1" />
           </template>
           <template slot="oceanFreight">
-            <el-input
-              size="mini"
-              v-model="form.oceanFreight"
+            <el-input size="mini" v-model="form.oceanFreight"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 实际海运费"
-              :disabled="detailData.status == 1"
-            />
+              placeholder="请输入 实际海运费" :disabled="detailData.status == 1" />
           </template>
           <template slot="orderNo">
-            <el-input
-              size="mini"
-              v-model="form.orderNo"
-              oninput="this.value=this.value.toUpperCase()"
-              placeholder="请输入 "
-              :disabled="detailData.status == 1"
-            />
+            <el-input size="mini" v-model="form.orderNo" oninput="this.value=this.value.toUpperCase()"
+              placeholder="请输入 " :disabled="detailData.status == 1" />
           </template>
         </avue-form>
       </trade-card>
       <div>
         <trade-card title="商品信息">
-          <avue-crud
-            ref="crud"
-            :data="data"
-            :option="tableOption"
-            @row-del="rowDel"
-            @selection-change="goodsSelectionChange"
-            @saveColumn="saveColumn"
-            @resetColumn="resetColumn"
-            :summary-method="summaryMethod"
-            :cell-style="cellStyle"
-          >
+          <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
+            @selection-change="goodsSelectionChange" @saveColumn="saveColumn" @resetColumn="resetColumn"
+            :summary-method="summaryMethod" :cell-style="cellStyle">
             <template slot="headerSerial">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click.stop="addRow"
-                :disabled="detailData.status == 1"
-                circle
-              ></el-button>
+              <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
+                :disabled="detailData.status == 1" circle></el-button>
             </template>
             <template slot="cname" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" style="display:flex">
-                <el-select
-                  v-model="row.itemId"
-                  placeholder="请选择"
-                  size="small"
-                  style="width:60%"
-                  @change="cnameChange(row, index)"
-                >
-                  <el-option
-                    v-for="item in goodsoptions"
-                    :key="item.id"
-                    :label="item.cname"
-                    :value="item.id"
-                  >
+                <el-select v-model="row.itemId" placeholder="请选择" size="small" style="width:60%"
+                  @change="cnameChange(row, index)">
+                  <el-option v-for="item in goodsoptions" :key="item.id" :label="item.cname" :value="item.id">
                   </el-option>
                 </el-select>
-                <el-button
-                  icon="el-icon-search"
-                  size="small"
-                  @click="rePick(row, index)"
-                ></el-button>
+                <el-button icon="el-icon-search" size="small" @click="rePick(row, index)"></el-button>
               </span>
               <span v-else> {{ row.cname }}</span>
             </template>
             <template slot="partsDescribe" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" style="display:flex">
-                <el-input
-                  v-model="row.partsDescribe"
-                  size="small"
-                  placeholder="请点击右边按钮"
-                ></el-input>
-                <el-button
-                  icon="el-icon-edit"
-                  size="mini"
-                  @click="partrePick(row, index)"
-                ></el-button>
+                <el-input v-model="row.partsDescribe" size="small" placeholder="请点击右边按钮"></el-input>
+                <el-button icon="el-icon-edit" size="mini" @click="partrePick(row, index)"></el-button>
               </span>
               <span v-else>{{ row.partsDescribe }}</span>
             </template>
             <template slot="itemType" slot-scope="{ row }">
-              <el-select
-                v-if="row.$cellEdit"
-                v-model="row.itemType"
-                filterable
-                allow-create
-                default-first-option
-                placeholder="请输入"
-                size="small"
-                @focus="itemTypeFocus(row)"
-              >
-                <el-option
-                  v-for="(item, index) in itemtypeList"
-                  :key="index"
-                  :label="item.value"
-                  :value="item.value"
-                >
+              <el-select v-if="row.$cellEdit" v-model="row.itemType" filterable allow-create default-first-option
+                placeholder="请输入" size="small" @focus="itemTypeFocus(row)">
+                <el-option v-for="(item, index) in itemtypeList" :key="index" :label="item.value" :value="item.value">
                 </el-option>
               </el-select>
               <span v-else>{{ row.itemType }}</span>
             </template>
             <template slot="itemProp" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" style="display:flex">
-                <el-input
-                  v-model="row.itemProp"
-                  size="small"
-                  placeholder="请点击右边按钮"
-                ></el-input>
-                <el-button
-                  icon="el-icon-edit"
-                  size="mini"
-                  @click="openProperty(row, index)"
-                ></el-button>
+                <el-input v-model="row.itemProp" size="small" placeholder="请点击右边按钮"></el-input>
+                <el-button icon="el-icon-edit" size="mini" @click="openProperty(row, index)"></el-button>
               </span>
               <span v-else>{{ row.itemProp }}</span>
             </template>
             <template slot="priorityReferrer" slot-scope="{ row }">
-              <el-checkbox
-                :disabled="!row.$cellEdit"
-                v-model="row.priorityReferrer"
-                :true-label="1"
-                :false-label="0"
-              />
+              <el-checkbox :disabled="!row.$cellEdit" v-model="row.priorityReferrer" :true-label="1" :false-label="0" />
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <span>{{ row.corpName }}</span>
             </template>
             <template slot="purchaseCost" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.purchaseCost"
-                size="small"
-                placeholder="请输入"
-                oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              ></el-input>
+              <el-input v-if="row.$cellEdit" v-model="row.purchaseCost" size="small" placeholder="请输入"
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"></el-input>
               <span v-else>{{ row.purchaseCost | micrometerFormat }}</span>
             </template>
             <template slot="purchaseAmount" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.purchaseAmount"
-                size="small"
-                placeholder="请输入"
+              <el-input v-if="row.$cellEdit" v-model="row.purchaseAmount" size="small" placeholder="请输入"
                 @change="purchaseAmountChange(row)"
-                oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              ></el-input>
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"></el-input>
               <span v-else>{{ row.purchaseAmount | micrometerFormat }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.price"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.price" size="small"
                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                @change="priceChange(row)"
-              ></el-input>
+                @change="priceChange(row)"></el-input>
               <span v-else>{{ row.price | micrometerFormat }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <span>{{ row.amount | micrometerFormat }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.orderQuantity"
-                size="small"
-                oninput='this.value=this.value.replace(/[^(\d)]/g,"")'
-                @change="priceChange(row)"
-              ></el-input>
+              <el-input v-if="row.$cellEdit" v-model="row.orderQuantity" size="small"
+                oninput='this.value=this.value.replace(/[^(\d)]/g,"")' @change="priceChange(row)"></el-input>
               <span v-else>{{ row.orderQuantity | IntegerFormat }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
               <span>{{ row.actualQuantity | IntegerFormat }}</span>
             </template>
             <template slot="discount" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.discount"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.discount" size="small"
                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                @change="discountChange(row)"
-              ></el-input>
+                @change="discountChange(row)"></el-input>
               <span v-else>{{ row.discount | isDiscount }}</span>
             </template>
             <template slot="insurance" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.insurance"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.insurance" size="small"
                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                @change="priceChange(row)"
-              ></el-input>
+                @change="priceChange(row)"></el-input>
               <span v-else>{{ row.insurance | micrometerFormat }}</span>
             </template>
             <template slot="freight" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.freight"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.freight" size="small"
                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                @change="priceChange(row)"
-              ></el-input>
+                @change="priceChange(row)"></el-input>
               <span v-else>{{ row.freight | micrometerFormat }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.taxRate"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                @change="taxRateChange(row)"
-              ></el-input>
+                @change="taxRateChange(row)"></el-input>
               <span v-else>{{ row.taxRate | isPercentage }}</span>
             </template>
             <template slot="itemMargin" slot-scope="{ row }">
               <span>{{ row.itemMargin | isPercentage }}</span>
             </template>
             <template slot="menuLeft">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="small"
-                @click.stop="newDetails"
-                :disabled="detailData.status == 1"
-                >批量录入</el-button
-              >
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="small"
-                @click.stop="addLibrary"
-                :disabled="detailData.status == 1"
-                >出口价格库</el-button
-              >
-              <el-button
-                type="info"
-                icon="el-icon-printer"
-                size="small"
-                @click.stop="openReport()"
-                >报表打印</el-button
-              >
-              <el-button
-                type="warning"
-                icon="el-icon-plus"
-                size="small"
-                :disabled="detailData.status == 1 || orderItemIds.length == 0"
-                @click="getInvoice"
-                >生成发货单
+              <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails"
+                :disabled="detailData.status == 1">批量录入</el-button>
+              <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addLibrary"
+                :disabled="detailData.status == 1">出口价格库</el-button>
+              <el-button type="info" icon="el-icon-printer" size="small" @click.stop="openReport()">报表打印</el-button>
+              <el-button type="warning" icon="el-icon-plus" size="small"
+                :disabled="detailData.status == 1 || orderItemIds.length == 0" @click="getInvoice">生成发货单
               </el-button>
             </template>
             <template slot="menu" slot-scope="{ row, index }">
-              <el-button
-                size="small"
-                icon="el-icon-edit"
-                type="text"
-                @click="rowCell(row, index)"
-                :disabled="disabled || detailData.status == 1"
-                >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
-              >
-              <el-button
-                size="small"
-                icon="el-icon-delete"
-                type="text"
-                @click="rowDel(row)"
-                :disabled="detailData.status == 1"
-                >删除</el-button
-              >
+              <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
+                :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
+              <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row)"
+                :disabled="detailData.status == 1">删除</el-button>
             </template>
           </avue-crud>
         </trade-card>
       </div>
-      <fee-info
-        ref="feeInfo"
-        :orderFeesList="orderFeesList"
-        :disabled="detailData.status == 1"
-        feeUrl="/blade-purchase-sales/orderfees/update"
-        optionType="CK"
-        itemType="销售"
-        @beforeFinance="beforeFinance"
-        :inCropId="true"
-      />
+      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
+        feeUrl="/blade-purchase-sales/orderfees/update" optionType="CK" itemType="销售" @beforeFinance="beforeFinance"
+        :inCropId="true" />
       <containerTitle title="合同附件"></containerTitle>
-      <c-upload
-        typeUpload="CK"
-        :data="orderFilesList"
-        :disabled="detailData.status == 1"
-        :enumerationValue="76"
-        deleteUrl="/blade-purchase-sales/orderfiles/update"
-      />
+      <c-upload typeUpload="CK" :data="orderFilesList" :disabled="detailData.status == 1" :enumerationValue="76"
+        deleteUrl="/blade-purchase-sales/orderfiles/update" />
       <div>
         <trade-card title="银行信息">
-          <avue-form
-            class="trading-form"
-            ref="form"
-            v-model="form"
-            :option="bankOption"
-          />
+          <avue-form class="trading-form" ref="form" v-model="form" :option="bankOption" />
         </trade-card>
       </div>
       <div>
         <trade-card title="保险信息">
-          <avue-form
-            class="trading-form"
-            ref="form"
-            v-model="form"
-            :option="insuranceOption"
-          />
+          <avue-form class="trading-form" ref="form" v-model="form" :option="insuranceOption" />
         </trade-card>
       </div>
       <div>
         <trade-card title="唛头">
-          <avue-form
-            class="trading-form"
-            ref="form"
-            v-model="form"
-            :option="markOption"
-          />
+          <avue-form class="trading-form" ref="form" v-model="form" :option="markOption" />
         </trade-card>
       </div>
     </div>
-    <el-dialog
-      title="账单"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="financialAccountDialog"
-      width="60%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <financial-account
-        billType="收费"
-        :billData="billData"
-        itemType="销售"
-        @choceFun="choceFun"
-      >
+    <el-dialog title="账单" append-to-body class="el-dialogDeep" :visible.sync="financialAccountDialog" width="60%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <financial-account billType="收费" :billData="billData" itemType="销售" @choceFun="choceFun">
       </financial-account>
     </el-dialog>
-    <el-dialog
-      title="申请记录"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="applicationDialog"
-      width="60%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
+    <el-dialog title="申请记录" append-to-body class="el-dialogDeep" :visible.sync="applicationDialog" width="60%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <bill-application :billId="form.id" @choceApplication="choceApplication">
       </bill-application>
     </el-dialog>
-    <el-dialog
-      title="导入商品"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      @close="closeGoods"
-      top="5vh"
-      v-dialog-drag
-    >
+    <el-dialog title="导入商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods"
+      top="5vh" v-dialog-drag>
       <span>
         <el-row>
           <el-col :span="4">
             <div>
               <el-scrollbar>
                 <basic-container>
-                  <avue-tree
-                    :option="treeOption"
-                    @node-click="nodeClick"
-                    :style="treeStyle"
-                  />
+                  <avue-tree :option="treeOption" @node-click="nodeClick" :style="treeStyle" />
                 </basic-container>
               </el-scrollbar>
             </div>
           </el-col>
           <el-col :span="20">
-            <avue-crud
-              :option="goodsOption"
-              :table-loading="loading"
-              :data="goodsList"
-              ref="goodsCrud"
-              :search.sync="search"
-              @search-change="searchChange"
-              @refresh-change="refreshChange"
-              @selection-change="selectionChange"
-              @row-click="rowClick"
-              :page.sync="page"
-              @on-load="onLoad"
-              @saveColumn="saveGoodsColumn"
-              @resetColumn="resetGoodsColumn"
-              :cell-style="cellStyle"
-            ></avue-crud>
+            <avue-crud :option="goodsOption" :table-loading="loading" :data="goodsList" ref="goodsCrud"
+              :search.sync="search" @search-change="searchChange" @refresh-change="refreshChange"
+              @selection-change="selectionChange" @row-click="rowClick" :page.sync="page" @on-load="onLoad"
+              @saveColumn="saveGoodsColumn" @resetColumn="resetGoodsColumn" :cell-style="cellStyle"></avue-crud>
           </el-col>
         </el-row>
       </span>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="importGoods"
-          :disabled="selectionList.length == 0"
-          >导入</el-button
-        >
+        <el-button type="primary" @click="importGoods" :disabled="selectionList.length == 0">导入</el-button>
       </span>
     </el-dialog>
-    <report-dialog
-      :switchDialog="switchDialog"
-      :reportId="form.id"
-      reportName="销售明细(E)"
-      @onClose="onClose()"
-    ></report-dialog>
-    <part-dialog
-      ref="part"
-      :partList="partList"
-      @importPart="importPart"
-      @partClosed="partClosed"
-    />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="销售明细(E)" @onClose="onClose()">
+    </report-dialog>
+    <part-dialog ref="part" :partList="partList" @importPart="importPart" @partClosed="partClosed" />
     <price-library ref="library" @importLibray="importLibray" />
     <property-dialog ref="property" @importProperty="importProperty" />
   </div>
@@ -920,6 +563,13 @@ export default {
             valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
+            label: "日期说明",
+            prop: "dateDesc",
+            type: "textarea",
+            minRows: 1,
+            span: 6,
+          },
+          {
             label: "有效日期",
             prop: "dateValidity",
             span: 6,
@@ -1040,7 +690,7 @@ export default {
       treeOption: {
         nodeKey: "id",
         lazy: true,
-        treeLoad: function(node, resolve) {
+        treeLoad: function (node, resolve) {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
             resolve(
@@ -2372,7 +2022,7 @@ export default {
     }
   },
   watch: {
-    "form.corpId": function(id) {
+    "form.corpId": function (id) {
       if (id) {
         this.corpsattns = [];
         getCorpsattn({ pid: id }).then(res => {
@@ -2388,9 +2038,11 @@ export default {
 .trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
+
 ::v-deep .el-form-item__error {
   display: none !important;
 }
+
 ::v-deep .select-component {
   display: flex !important;
 }

src/views/reimbursement/detail.vue

@@ -2,297 +2,116 @@
   <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          :loading="btnLoading"
-        >返回列表</el-button>
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList" :loading="btnLoading">返回列表</el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button
-          type="primary"
-          size="small"
-          class="el-button--small-yh"
-          @click.stop="openEdit"
-          v-if="disabled"
-        >编 辑</el-button>
-        <el-button
-          v-if="checker && form.status != 3"
-          type="primary"
-          size="small"
-          class="el-button--small-yh"
+        <el-button type="primary" size="small" class="el-button--small-yh" @click.stop="openEdit" v-if="disabled">编 辑
+        </el-button>
+        <el-button v-if="checker && form.status != 3" type="primary" size="small" class="el-button--small-yh"
           @click.stop="openCheckDialog">
           审批
         </el-button>
-        <el-button
-          v-if="form.status > 0"
-          @click.native="checkScheduleDialog = true,checkId=form.id"
-          type="primary"
-          size="small"
-        >审核进度</el-button>
-        <el-button
-          type="primary"
-          v-if="!checkDisabled"
-          :disabled="!form.id || disabled"
-          size="small"
-          @click="pleaseCheck"
-          :loading="btnLoading"
-        >请核</el-button>
-        <el-button
-          type="success"
-          :disabled="!form.id"
-          size="small"
-          @click="copyDoc"
-          :loading="btnLoading"
-          v-if="false"
-        >复制单据</el-button>
-        <el-button
-          type="primary"
-          @click="editCustomer"
-          size="small"
-          :disabled="form.status > 0"
-          :loading="btnLoading"
-        >保存数据</el-button>
+        <el-button v-if="form.status > 0" @click.native="checkScheduleDialog = true, checkId = form.id" type="primary"
+          size="small">审核进度</el-button>
+        <el-button type="primary" v-if="!checkDisabled" :disabled="!form.id || disabled" size="small"
+          @click="pleaseCheck" :loading="btnLoading">请核</el-button>
+        <el-button type="success" :disabled="!form.id" size="small" @click="copyDoc" :loading="btnLoading" v-if="false">
+          复制单据</el-button>
+        <el-button type="primary" @click="editCustomer" size="small" :disabled="form.status > 0" :loading="btnLoading">
+          保存数据</el-button>
       </div>
     </div>
     <div class="customer-main">
-      <containerTitle title="基础信息"/>
+      <containerTitle title="基础信息" />
       <basic-container :showBtn="true">
-        <avue-form
-          ref="form"
-          class="trading-form"
-          v-model="form"
-          :option="option"
-        >
+        <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="userId">
-            <el-select
-              v-model="form.userId"
-              filterable
-              clearable
-              size="small"
-              placeholder="请选择"
-              @change="userHandle"
-              @clear="form.userName == null"
-              :disabled="disabled || checkDisabled"
-            >
-              <el-option
-                v-for="(item,index) in userList"
-                :key="index"
-                :label="item.realName"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.userId" filterable clearable size="small" placeholder="请选择" @change="userHandle"
+              @clear="form.userName == null" :disabled="disabled || checkDisabled">
+              <el-option v-for="(item, index) in userList" :key="index" :label="item.realName" :value="item.id">
+              </el-option>
             </el-select>
           </template>
           <template slot="deptId">
-            <avue-input-tree
-              leaf-only
-              style="width: 100%;"
-              size="small"
-              :props="{ label: 'title' }"
-              v-model="form.deptId"
-              placeholder=" "
-              type="tree"
-              :dic="dic"
-              :nodeClick="deptClick"
-              :disabled="disabled || checkDisabled"
-            ></avue-input-tree>
+            <avue-input-tree leaf-only style="width: 100%;" size="small" :props="{ label: 'title' }"
+              v-model="form.deptId" placeholder=" " type="tree" :dic="dic" :nodeClick="deptClick"
+              :disabled="disabled || checkDisabled"></avue-input-tree>
           </template>
           <template slot="postId">
-            <el-select
-              v-model="form.postId"
-              clearable
-              filterable
-              placeholder="请选择 岗位"
-              @change="postHandle"
-              @clear="form.postId == null"
-              :disabled="disabled || checkDisabled"
-            >
-              <el-option
-                v-for="(item, index) in postDic"
-                :label="item.postName"
-                :value="item.id"
-                :key="index"
-              />
+            <el-select v-model="form.postId" clearable filterable placeholder="请选择 岗位" @change="postHandle"
+              @clear="form.postId == null" :disabled="disabled || checkDisabled">
+              <el-option v-for="(item, index) in postDic" :label="item.postName" :value="item.id" :key="index" />
             </el-select>
           </template>
         </avue-form>
       </basic-container>
-      <containerTitle title="报销明细"/>
+      <containerTitle title="报销明细" />
       <basic-container>
-        <avue-crud
-          ref="crud"
-          :data="dataList"
-          :option="tableOption"
-          :cell-style="cellStyle"
-          @saveColumn="saveColumn"
-          @resetColumn="resetColumn"
-        >
+        <avue-crud ref="crud" :data="dataList" :option="tableOption" :cell-style="cellStyle" @saveColumn="saveColumn"
+          @resetColumn="resetColumn">
           <template slot="menuLeft">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="small"
-              @click.stop="newDetails"
-              :disabled="disabled || checkDisabled"
-            >录入明细</el-button>
-            <el-button
-              type="info"
-              icon="el-icon-printer"
-              size="small"
-              @click="openReport"
-            >报表打印</el-button>
+            <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails"
+              :disabled="disabled || checkDisabled">录入明细</el-button>
+            <el-button type="info" icon="el-icon-printer" size="small" @click="openReport">报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
-            <el-button
-              size="small"
-              icon="el-icon-edit"
-              type="text"
-              @click="rowCell(row, index)"
-              :disabled="disabled || checkDisabled"
-            >{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
-            <el-button
-              size="small"
-              icon="el-icon-delete"
-              type="text"
-              @click="rowDel(row, index)"
-              :disabled="disabled || checkDisabled"
-            >删除</el-button>
+            <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
+              :disabled="disabled || checkDisabled">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
+            <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
+              :disabled="disabled || checkDisabled">删除</el-button>
           </template>
           <template slot="payDate" slot-scope="{ row, index }">
-            <el-date-picker
-              v-if="row.$cellEdit"
-              v-model="row.payDate"
-              type="date"
-              placeholder="选择日期"
-              size="small"
-              style="width: 100%"
-              format="yyyy-MM-dd"
-              valueFormat="yyyy-MM-dd"
-            ></el-date-picker>
-            <span v-else>{{row.payDate}}</span>
+            <el-date-picker v-if="row.$cellEdit" v-model="row.payDate" type="date" placeholder="选择日期" size="small"
+              style="width: 100%" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"></el-date-picker>
+            <span v-else>{{ row.payDate }}</span>
           </template>
           <template slot="moldId" slot-scope="{ row }">
-            <avue-cascader
-              v-if="row.$cellEdit"
-              v-model="row.moldId"
-              size="small"
-              style="width: 100%;"
-              :dic="dicArea"
-              :props="props"
-              check-strictly
-              :emit-path="false"
-              :show-all-levels="false"
-              @change="moldChange($event,row,dicArea)"
-              @clear="row.feeList = feesOption"
-              placeholder="请选择"
-            ></avue-cascader>
+            <avue-cascader v-if="row.$cellEdit" v-model="row.moldId" size="small" style="width: 100%;" :dic="dicArea"
+              :props="props" check-strictly :emit-path="false" :show-all-levels="false"
+              @change="moldChange($event, row, dicArea)" @clear="row.feeList = feesOption" placeholder="请选择">
+            </avue-cascader>
             <span v-else="!row.$cellEdit">{{ row.mold }}</span>
           </template>
           <template slot="detailId" slot-scope="{ row }">
-            <el-select
-              v-if="row.$cellEdit"
-              v-model="row.detailId"
-              filterable
-              clearable
-              @change="detailChange(row)"
-              size="small"
-            >
-              <el-option
-                v-for="(item, index) in row.feeList"
-                :key="index"
-                :label="item.cname"
-                :value="item.id"
-              ></el-option>
+            <el-select v-if="row.$cellEdit" v-model="row.detailId" filterable clearable @change="detailChange(row)"
+              size="small">
+              <el-option v-for="(item, index) in row.feeList" :key="index" :label="item.cname" :value="item.id">
+              </el-option>
             </el-select>
             <span v-else>{{ row.detail }}</span>
           </template>
           <template slot="explanation" slot-scope="{ row, index }">
-            <el-input
-              v-if="row.$cellEdit"
-              v-model="row.explanation"
-              size="small"
-              placeholder="输入内容"
-            />
-            <span v-else>{{row.explanation}}</span>
+            <el-input v-if="row.$cellEdit" v-model="row.explanation" size="small" placeholder="输入内容" />
+            <span v-else>{{ row.explanation }}</span>
           </template>
           <template slot="payMethod" slot-scope="{ row, index }">
-            <el-select
-              v-model="row.payMethod"
-              size="small"
-              placeholder="请选择"
-              clearable
-              :disabled="!row.$cellEdit"
-            >
-              <el-option
-                v-for="(item, index) in paymentOption"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
-              ></el-option>
+            <el-select v-model="row.payMethod" size="small" placeholder="请选择" clearable :disabled="!row.$cellEdit">
+              <el-option v-for="(item, index) in paymentOption" :key="item.dictKey" :label="item.dictValue"
+                :value="item.dictKey"></el-option>
             </el-select>
           </template>
           <template slot="amount" slot-scope="{ row, index }">
-            <el-input-number
-              v-if="row.$cellEdit"
-              v-model="row.amount"
-              size="small"
-              :controls="false"
-              :precision="2"
-              style="width: 100%"
-              placeholder="金额"
-            ></el-input-number>
+            <el-input-number v-if="row.$cellEdit" v-model="row.amount" size="small" :controls="false" :precision="2"
+              style="width: 100%" placeholder="金额"></el-input-number>
             <span v-else>{{ row.amount }}</span>
           </template>
         </avue-crud>
       </basic-container>
     </div>
 
-    <el-dialog
-      append-to-body
-      title="审批"
-      class="el-dialogDeep"
-      :visible.sync="checkDialog"
-      width="50%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <check
-        :checkData="checkData"
-        :checkDetail="false"
-        :idList="[]"
-        @choceCheckFun="choceCheckFun"
-      >
+    <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
       </check>
     </el-dialog>
-    <el-dialog
-      append-to-body
-      title="审批进度"
-      class="el-dialogDeep"
-      :visible.sync="checkScheduleDialog"
-      width="40%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <check-schedule
-        :checkId="checkId"
-        :batchNo="batchNo"
-        @choceScheduleFun="choceScheduleFun"
-      >
+    <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
       </check-schedule>
     </el-dialog>
     <!--    报表-->
-    <report-dialog
-      :switchDialog="switchDialog"
-      :reportId="form.id"
-      reportName="事务-报销单"
-      @onClose="onClose()"
-    />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="事务-报销单" @onClose="onClose()" />
   </div>
 </template>
 
@@ -305,16 +124,16 @@ import {
   IntegerFormat
 } from "@/util/validate";
 import { gainUser } from "@/api/basicData/customerInquiry";
-import {getUserInfo} from "@/api/system/user";
-import {getDeptTree} from "@/api/system/dept";
+import { getUserInfo } from "@/api/system/user";
+import { getDeptTree } from "@/api/system/dept";
 import { getCurrentDate } from "@/util/date";
-import {getList as getPostList} from "@/api/system/post";
-import {dataDetail, typeSave, removeGoods, pleaseCheck} from "@/api/standAlone/reimbursement";
+import { getList as getPostList } from "@/api/system/post";
+import { dataDetail, typeSave, removeGoods, pleaseCheck } from "@/api/standAlone/reimbursement";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
 import reportDialog from "@/components/report-dialog/main";
-import {getDeptTree as getFeesId, customerList as getFeesList} from "@/api/basicData/basicFeesDesc";
+import { getDeptTree as getFeesId, getFeesList } from "@/api/basicData/basicFeesDesc";
 
 export default {
   name: "detail",
@@ -418,7 +237,7 @@ export default {
       checkDisabled: false, // 审核状态
       checker: false,
       checkId: '',
-      batchNo:'',
+      batchNo: '',
       checkDialog: false,
       checkScheduleDialog: false,
       checkData: {},
@@ -466,15 +285,8 @@ export default {
     getFeesId().then(res => {
       this.dicArea = res.data.data;
     })
-    getFeesList({size: 10, current: 1}).then(res => {
-      this.feesOption = res.data.data.total > 0? res.data.data.records: [];
-      if (Math.ceil(res.data.data.total / 10) > 1) {
-        for (let i = 2; i <= Math.ceil(res.data.data.total / 10); i++) {
-          getFeesList({size: 10, current: 1}).then(e => {
-            this.feesOption = this.feesOption.concat(e.data.data.records);
-          });
-        }
-      }
+    getFeesList().then(res => {
+      this.feesOption = res.data.data;
     });
     this.getWorkDicts('unit').then(res => {
       this.unitOption = res.data.data;
@@ -506,17 +318,17 @@ export default {
     // 查询
     queryData(id) {
       this.pageLoading = true;
-      dataDetail({id: id}).then(res => {
+      dataDetail({ id: id }).then(res => {
         this.form = res.data.data;
-        this.dataList = this.form.itemList? this.form.itemList: [];
+        this.dataList = this.form.itemList ? this.form.itemList : [];
         this.dataList.forEach(item => {
           this.moldChange(item.moldId, item, this.dicArea)
           item.payMethod = item.payMethod.toString();
         })
         delete this.form.itemList;
-        this.oldForm = {...this.form};
+        this.oldForm = { ...this.form };
         this.oldDataList = [...this.dataList];
-        this.checkDisabled = this.form.status > 0? true: false;
+        this.checkDisabled = this.form.status > 0 ? true : false;
         if (this.form.status > 0) {
           this.option.column.map(e => {
             this.$set(e, 'disabled', true)
@@ -555,7 +367,7 @@ export default {
           this.$set(this.form, 'itemList', this.dataList)
           this.btnLoading = true;
           typeSave(this.form).then(res => {
-            this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
+            this.$message({ type: "success", message: this.form.id ? "修改成功!" : "新增成功!" });
             this.queryData(res.data.data);
           }).finally(() => {
             this.btnLoading = false;
@@ -641,7 +453,7 @@ export default {
         }
       });
     },
-    getKHData(row) {},
+    getKHData(row) { },
     //选择费用
     selectValue(value, row) {
       console.log(value)
@@ -674,27 +486,27 @@ export default {
       this.$set(this.form, 'deptName', data.title)
     },
     //打开审核
-    openCheckDialog(){
-      this.checkData  = this.detailData.check
+    openCheckDialog() {
+      this.checkData = this.detailData.check
       this.checkDialog = true;
     },
     //关闭审核
-    choceCheckFun(){
+    choceCheckFun() {
       this.checkDialog = false;
     },
-    choceScheduleFun(){
+    choceScheduleFun() {
       this.checkScheduleDialog = false
     },
     // 请核
     pleaseCheck() {
       if (this.verification()) {
         const data = {
-          id : this.form.id,
+          id: this.form.id,
           serialNo: this.form.serialNo,
           checkType: 'fybx',
           url: '/reimbursement/index',
-          pageStatus:"this.$store.getters.reimbursementStatus",
-          pageLabel:"报销",
+          pageStatus: "this.$store.getters.reimbursementStatus",
+          pageLabel: "报销",
           checkFlag: 1,
         }
         this.btnLoading = true;
@@ -710,7 +522,7 @@ export default {
     },
     // 报表
     openReport() {
-      this.switchDialog =! this.switchDialog;
+      this.switchDialog = !this.switchDialog;
     },
     // 报表关闭
     onClose(val) {
@@ -720,26 +532,13 @@ export default {
       list.forEach(item => {
         if (e == item.value) {
           this.$set(row, 'mold', item.title);
-          getFeesList({size: 10, current: 1,feesTypeId: e}).then(res => {
-            this.$set(row, 'feeList', res.data.data.total > 0? res.data.data.records: []);
-            if (Math.ceil(res.data.data.total / 10) > 1) {
-              for (let i = 2; i <= Math.ceil(res.data.data.total / 10); i++) {
-                getFeesList({size: 10, current: 1,feesTypeId: e}).then(e => {
-                  row.feeList = row.feeList.concat(e.data.data.records);
-                });
+          getFeesList({ feesTypeId: e }).then(res => {
+            this.$set(row, 'feeList', res.data.data);
+            this.$nextTick(() => {
+              if (!(row.feeList.some(item => item.id == row.detailId))) {
+                this.$set(row, 'detailId', null);
               }
-              this.$nextTick(() => {
-                if (!(row.feeList.some(item => item.id == row.detailId))) {
-                  this.$set(row, 'detailId', null);
-                }
-              })
-            } else {
-              this.$nextTick(() => {
-                if (!(row.feeList.some(item => item.id == row.detailId))) {
-                  this.$set(row, 'detailId', null);
-                }
-              })
-            }
+            })
           });
         }
         if (item.hasChildren) {
@@ -748,12 +547,11 @@ export default {
       })
     },
     detailChange(row) {
-      row.detail = row.feeList.find(item => item.id == row.detailId)? row.feeList.find(item => item.id == row.detailId).cname: null
+      row.detail = row.feeList.find(item => item.id == row.detailId) ? row.feeList.find(item => item.id == row.detailId).cname : null
     },
   },
 }
 </script>
 
 <style scoped>
-
 </style>

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -124,7 +124,7 @@
       "width": 100
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "overHidden": true,
       "index": 9,

src/views/workManagement/main-items/detailsPage.vue

@@ -615,7 +615,7 @@
               ]
             },
             {
-              label: '总代垫费',
+              label: '总成本',
               prop: 'matMoney',
               type:'unit',
               disabled: true,
@@ -952,7 +952,7 @@
             return parseFloat(item.serviceCharge);
           }else return 0
         });
-        //明细列表代垫费合计
+        //明细列表成本合计
         let matMoneyList =  this.data.map(item => {
           if(item.matMoney){
             return parseFloat(item.matMoney);

src/views/workManagement/main-items/list.vue

@@ -36,7 +36,7 @@
           <el-table-column  label="开始日期" prop="beginTime" align="center" show-overflow-tooltip width="120"></el-table-column>
           <el-table-column  label="完成日期" prop="actualDate" align="center" show-overflow-tooltip width="180"></el-table-column>
           <el-table-column  label="服务费" prop="serviceCharge" align="center" show-overflow-tooltip width="200"></el-table-column>
-          <el-table-column  label="代垫费" prop="matMoney" align="center" show-overflow-tooltip width="200"></el-table-column>
+          <el-table-column  label="成本" prop="matMoney" align="center" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column  label="未知明细收入" prop="otheramt" align="center" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column  label="合计金额" prop="amount" align="center" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column  label="收款方式" prop="accountName" align="center" show-overflow-tooltip width="200"></el-table-column>

src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -77,7 +77,7 @@
       "width": 120
     },
     {
-      "label": "总代垫费",
+      "label": "总成本",
       "prop": "matMoney",
       "overHidden": true,
       "index": 6,

src/views/workManagement/receipt/configuration/settleAccountsDetailsADD.json

@@ -65,7 +65,7 @@
       "width": 100
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "overHidden": true,
       "index": 4,

src/views/workManagement/receipt/configuration/settleAccountsDetailsPage.json

@@ -48,7 +48,7 @@
       "width": 120
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "width": 120
     },

src/views/workManagement/receipt/configuration/settleAccountsDetailsReturn.json

@@ -57,7 +57,7 @@
       "width": 100
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "overHidden": true,
       "index": 1,

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -134,7 +134,7 @@
       "width": 120
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "index": 7,
       "overHidden": true,

src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -377,7 +377,7 @@
               ]
             },
             {
-              label: '代垫费',
+              label: '成本',
               prop: 'matMoney',
               type:'unit',
               disabled: true,
@@ -659,7 +659,7 @@
             return this.$message.error(`请输入明细列表服务费必填项`);
           }
           if(this.allDataList[i].matMoney === (null || "")){
-            return this.$message.error(`请输入明细列表代垫费必填项`);
+            return this.$message.error(`请输入明细列表成本必填项`);
           }
 
           if(this.allDataList[i].userid === (null || "")){

src/views/workManagement/task/configuration/mainList.json

@@ -107,7 +107,7 @@
       "width": 120
     },
     {
-      "label": "代垫费",
+      "label": "成本",
       "prop": "matMoney",
       "width": 120
     },