所有流程样式调整

src/components/process/EHSD/Contract.vue

@@ -724,9 +724,14 @@ const formConfig = computed(() => {
       label: "",
     },
     {
+      type: "title",
+      title: "商品信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "commodity",
-      label: "商品信息",
+      label: "",
     },
     {
       type: "slot",

src/components/process/EHSD/ContractChange.vue

@@ -764,9 +764,14 @@ const formConfig = computed(() => {
       label: "",
     },
     {
+      type: "title",
+      title: "商品信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "commodity",
-      label: "商品信息",
+      label: "",
     },
     {
       type: "slot",

src/components/process/EHSD/PriceSheet.vue

@@ -1,51 +1,27 @@
 <template>
   <div style="width: 100%; padding: 0px 15px">
-    <byForm
-      :formConfig="formConfig"
-      :formOption="formOption"
-      v-model="formData.data"
-      :rules="rules"
-      ref="submit"
-    >
+    <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
       <template #seller>
         <div style="width: 100%">
           <el-form-item prop="sellCorporationId">
-            <el-select
-              v-model="formData.data.sellCorporationId"
-              style="width: 100%"
-              disabled
-            >
-              <el-option
-                v-for="item in corporationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="formData.data.sellCorporationId" style="width: 100%" disabled>
+              <el-option v-for="item in corporationList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="地址" prop="sellCountryName">
-                <el-input
-                  v-model="formData.data.sellCountryName"
-                  placeholder="请输入国家"
-                />
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellProvinceName">
-                <el-input
-                  v-model="formData.data.sellProvinceName"
-                  placeholder="请输入省/州"
-                />
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellCityName">
-                <el-input
-                  v-model="formData.data.sellCityName"
-                  placeholder="请输入城市"
-                />
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -60,18 +36,12 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="联系人" prop="sellContactName">
-                <el-input
-                  v-model="formData.data.sellContactName"
-                  placeholder="请输入联系人"
-                />
+                <el-input v-model="formData.data.sellContactName" placeholder="请输入联系人" />
               </el-form-item>
             </el-col>
             <el-col :span="16">
               <el-form-item label=" " prop="sellContactNumber">
-                <el-input
-                  v-model="formData.data.sellContactNumber"
-                  placeholder="请输入联系人电话"
-                />
+                <el-input v-model="formData.data.sellContactNumber" placeholder="请输入联系人电话" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -95,87 +65,42 @@
               </el-select>
             </el-form-item> -->
             <el-form-item prop="buyCorporationId">
-              <el-select
-                v-model="formData.data.buyCorporationId"
-                filterable
-                remote
-                reserve-keyword
-                placeholder="请输入关键字"
-                remote-show-suffix
-                :remote-method="remoteMethod"
-                :loading="loadingSearch"
-                @input="remoteMethod"
-                style="width: 100%"
-                @change="changeCustomer"
-                v-if="
+              <el-select v-model="formData.data.buyCorporationId" filterable remote reserve-keyword placeholder="请输入关键字" remote-show-suffix
+                         :remote-method="remoteMethod" :loading="loadingSearch" @input="remoteMethod" style="width: 100%" @change="changeCustomer"
+                         v-if="
                   [30].includes(route.query.processType) ||
                   !route.query.processType
-                "
-              >
-                <el-option
-                  v-for="item in customerList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+                ">
+                <el-option v-for="item in customerList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <el-select
-                v-model="formData.data.buyCorporationName"
-                disabled
-                v-else
-                style="width: 100%"
-              >
+              <el-select v-model="formData.data.buyCorporationName" disabled v-else style="width: 100%">
               </el-select>
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
                 <el-form-item label="地址" prop="countryId">
-                  <el-select
-                    v-model="formData.data.countryId"
-                    placeholder="国家"
-                    filterable
-                    @change="(val) => getCityData(val, '20', true)"
-                  >
-                    <el-option
-                      v-for="item in countryData"
-                      :label="item.chineseName"
-                      :value="item.id"
-                    >
+                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable @change="(val) => getCityData(val, '20', true)">
+                    <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="provinceName">
-                  <selectCity
-                    placeholder="省/洲"
-                    @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
-                    addressName="provinceName"
-                    v-model="formData.data"
-                    :data="provinceData"
-                  >
+                  <selectCity placeholder="省/洲" @change="(val) => getCityData(val, '30', true)" addressId="provinceId" addressName="provinceName"
+                              v-model="formData.data" :data="provinceData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity
-                    placeholder="城市"
-                    addressId="cityId"
-                    addressName="cityName"
-                    v-model="formData.data"
-                    :data="cityData"
-                  >
+                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyPostalCode">
-                  <el-input
-                    v-model="formData.data.buyPostalCode"
-                    placeholder="请输入邮编"
-                  />
+                  <el-input v-model="formData.data.buyPostalCode" placeholder="请输入邮编" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -190,23 +115,14 @@
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="8">
                 <el-form-item label="联系人" prop="buyContactName">
-                  <el-autocomplete
-                    v-model="formData.data.buyContactName"
-                    :fetch-suggestions="querySearchPerson"
-                    clearable
-                    class="inline-input w-50"
-                    placeholder="请输入联系人"
-                    @select="handlePerson"
-                  >
+                  <el-autocomplete v-model="formData.data.buyContactName" :fetch-suggestions="querySearchPerson" clearable class="inline-input w-50"
+                                   placeholder="请输入联系人" @select="handlePerson">
                   </el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
                 <el-form-item label=" " prop="buyContactNumber">
-                  <el-input
-                    v-model="formData.data.buyContactNumber"
-                    placeholder="请输入联系人电话"
-                  />
+                  <el-input v-model="formData.data.buyContactNumber" placeholder="请输入联系人电话" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -218,60 +134,29 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="币种" prop="currency">
-                <el-select
-                  v-model="formData.data.currency"
-                  placeholder="请选择币种"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in accountCurrency"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.currency" placeholder="请选择币种" style="width: 100%">
+                  <el-option v-for="item in accountCurrency" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="付款方式" prop="paymentMethod">
-                <el-select
-                  v-model="formData.data.paymentMethod"
-                  placeholder="请选择付款方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in fundsPaymentMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.paymentMethod" placeholder="请选择付款方式" style="width: 100%">
+                  <el-option v-for="item in fundsPaymentMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="预付比例 (%)" prop="advanceRatio">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.advanceRatio"
-                  placeholder="请输入预付比例"
-                  style="width: 100%"
-                  :precision="2"
-                  :controls="false"
-                  :min="0"
-                  :max="100"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.advanceRatio" placeholder="请输入预付比例" style="width: 100%"
+                                 :precision="2" :controls="false" :min="0" :max="100" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="18">
               <el-form-item label="付款条件" prop="remark">
-                <el-input
-                  v-model="formData.data.remark"
-                  :rows="2"
-                  type="textarea"
-                  placeholder="请输入付款条件"
-                />
+                <el-input v-model="formData.data.remark" :rows="2" type="textarea" placeholder="请输入付款条件" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -282,49 +167,25 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="报价有效期 (天)" prop="effective">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.effective"
-                  placeholder="请输入有效期"
-                  style="width: 100%"
-                  :precision="0"
-                  :controls="false"
-                  :min="0"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.effective" placeholder="请输入有效期" style="width: 100%"
+                                 :precision="0" :controls="false" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="交货期限" prop="deliveryTime">
-                <el-date-picker
-                  v-model="formData.data.deliveryTime"
-                  type="date"
-                  placeholder="请选择交货期限"
-                  value-format="YYYY-MM-DD"
-                />
+                <el-date-picker v-model="formData.data.deliveryTime" type="date" placeholder="请选择交货期限" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输方式" prop="transportMethod">
-                <el-select
-                  v-model="formData.data.transportMethod"
-                  placeholder="请选择运输方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in shippingMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.transportMethod" placeholder="请选择运输方式" style="width: 100%">
+                  <el-option v-for="item in shippingMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输说明" prop="transportRemark">
-                <el-input
-                  v-model="formData.data.transportRemark"
-                  placeholder="请输入运输说明"
-                />
+                <el-input v-model="formData.data.transportRemark" placeholder="请输入运输说明" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -332,24 +193,13 @@
       </template>
       <template #commodity>
         <div style="width: 100%">
-          <el-button type="primary" @click="openProductCompany = true" plain
-            >标准产品库</el-button
-          >
-          <el-button type="primary" @click="clickCustomerProduct()" plain
-            >客户产品库</el-button
-          >
-          <el-table
-            :data="formData.data.quotationProductList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-button type="primary" @click="openProductCompany = true" plain>标准产品库</el-button>
+          <el-button type="primary" @click="clickCustomerProduct()" plain>客户产品库</el-button>
+          <el-table :data="formData.data.quotationProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
                 <div v-if="row.fileUrl">
-                  <img
-                    :src="row.fileUrl"
-                    class="pic"
-                    @click="onPicture(row.fileUrl)"
-                  />
+                  <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>
               </template>
@@ -357,16 +207,9 @@
             <el-table-column label="商品名称" min-width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.productName'"
-                    :rules="rules.productName"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input
-                      v-model="row.productName"
-                      placeholder="请输入商品名称"
-                    />
+                  <el-form-item :prop="'quotationProductList.' + $index + '.productName'" :rules="rules.productName" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input v-model="row.productName" placeholder="请输入商品名称" />
                   </el-form-item>
                 </div>
               </template>
@@ -374,12 +217,8 @@
             <el-table-column label="尺寸 cm*cm*cm" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.productModel'"
-                    :rules="rules.productModel"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'quotationProductList.' + $index + '.productModel'" :rules="rules.productModel" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.productModel" placeholder="请输入" />
                   </el-form-item>
                 </div>
@@ -388,22 +227,10 @@
             <el-table-column label="数量" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.quantity'"
-                    :rules="rules.quantity"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.quantity"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="0"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount()"
-                    />
+                  <el-form-item :prop="'quotationProductList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.quantity" placeholder="请输入" style="width: 100%" :precision="0"
+                                     :controls="false" :min="0" @change="calculationAmount()" />
                   </el-form-item>
                 </div>
               </template>
@@ -411,22 +238,9 @@
             <el-table-column label="单价" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.price'"
-                    :rules="rules.price"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.price"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount()"
-                    />
+                  <el-form-item :prop="'quotationProductList.' + $index + '.price'" :rules="rules.price" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.price" placeholder="请输入" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="calculationAmount()" />
                   </el-form-item>
                 </div>
               </template>
@@ -434,23 +248,10 @@
             <el-table-column label="贸易方式" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.tradeMethods'"
-                    :rules="rules.tradeMethods"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-select
-                      v-model="row.tradeMethods"
-                      placeholder="请选择"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in tradeMethods"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
+                  <el-form-item :prop="'quotationProductList.' + $index + '.tradeMethods'" :rules="rules.tradeMethods" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-select v-model="row.tradeMethods" placeholder="请选择" style="width: 100%">
+                      <el-option v-for="item in tradeMethods" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -459,32 +260,17 @@
             <el-table-column label="包装方式" width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationProductList.' + $index + '.packMethod'"
-                    :rules="rules.packMethod"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'quotationProductList.' + $index + '.packMethod'" :rules="rules.packMethod" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.packMethod" placeholder="请输入" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="amount"
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-            />
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column prop="amount" :label="'金额 ( ' + formData.data.currency + ' )'" width="130" />
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ $index }">
-                <el-button type="primary" link @click="handleRemove($index)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -493,25 +279,13 @@
       <template #otherCharge>
         <div style="width: 100%">
           <el-button type="primary" @click="clickAdd()">添加行</el-button>
-          <el-table
-            :data="formData.data.quotationPayList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-table :data="formData.data.quotationPayList" style="width: 100%; margin-top: 16px">
             <el-table-column label="收费项目" width="220">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationPayList.' + $index + '.payName'"
-                    :rules="rules.payName"
-                    :inline-message="true"
-                  >
-                    <el-autocomplete
-                      v-model="row.payName"
-                      :fetch-suggestions="querySearch"
-                      clearable
-                      class="inline-input w-50"
-                      placeholder="请输入收费项目"
-                    />
+                  <el-form-item :prop="'quotationPayList.' + $index + '.payName'" :rules="rules.payName" :inline-message="true">
+                    <el-autocomplete v-model="row.payName" :fetch-suggestions="querySearch" clearable class="inline-input w-50"
+                                     placeholder="请输入收费项目" />
                   </el-form-item>
                 </div>
               </template>
@@ -519,50 +293,25 @@
             <el-table-column label="备注">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationPayList.' + $index + '.remark'"
-                  >
+                  <el-form-item :prop="'quotationPayList.' + $index + '.remark'">
                     <el-input v-model="row.remark" placeholder="请输入备注" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-            >
+            <el-table-column :label="'金额 ( ' + formData.data.currency + ' )'" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'quotationPayList.' + $index + '.amount'"
-                    :rules="rules.amount"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.amount"
-                      placeholder="请输入金额"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="totalAmount()"
-                    />
+                  <el-form-item :prop="'quotationPayList.' + $index + '.amount'" :rules="rules.amount" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.amount" placeholder="请输入金额" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="totalAmount()" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ $index }">
-                <el-button type="primary" link @click="handleDelete($index)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -572,47 +321,20 @@
         <div style="width: 100%; display: flex">
           <div style="width: calc(100% - 190px)"></div>
           <div style="width: 130px; padding: 0 12px">
-            <el-form-item
-              label="合同总金额"
-              prop="amount"
-              class="shrinkPadding"
-            >
-              <el-input
-                v-model="formData.data.amount"
-                placeholder="合同总金额"
-                disabled
-              />
+            <el-form-item label="合同总金额" prop="amount" class="shrinkPadding">
+              <el-input v-model="formData.data.amount" placeholder="合同总金额" disabled />
             </el-form-item>
           </div>
         </div>
       </template>
     </byForm>
 
-    <el-dialog
-      v-if="openProductCompany"
-      v-model="openProductCompany"
-      title="公司产品库"
-      width="90%"
-      append-to-body
-    >
-      <CompanyProduct
-        :selectStatus="true"
-        @selectProduct="selectProduct"
-      ></CompanyProduct>
+    <el-dialog v-if="openProductCompany" v-model="openProductCompany" title="公司产品库" width="90%" append-to-body>
+      <CompanyProduct :selectStatus="true" @selectProduct="selectProduct"></CompanyProduct>
     </el-dialog>
 
-    <el-dialog
-      v-if="openProductCustomer"
-      v-model="openProductCustomer"
-      title="客户产品库"
-      width="90%"
-      append-to-body
-    >
-      <CustomerProduct
-        :selectStatus="true"
-        :buyCorporationId="formData.data.buyCorporationId"
-        @selectProduct="selectProduct"
-      ></CustomerProduct>
+    <el-dialog v-if="openProductCustomer" v-model="openProductCustomer" title="客户产品库" width="90%" append-to-body>
+      <CustomerProduct :selectStatus="true" :buyCorporationId="formData.data.buyCorporationId" @selectProduct="selectProduct"></CustomerProduct>
     </el-dialog>
   </div>
 </template>
@@ -701,24 +423,44 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "title",
+      title: "付款信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "payment",
-      label: "付款信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "交付信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "delivery",
-      label: "交付信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "商品信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "commodity",
-      label: "商品信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "其他收费项目",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "otherCharge",
-      label: "其他收费项目",
+      label: "",
     },
     {
       type: "slot",

src/components/process/EHSD/Purchase.vue

@@ -613,38 +613,68 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "title",
+      title: "付款信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "payment",
-      label: "付款信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "交付信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "delivery",
-      label: "交付信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "采购明细",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "commodity",
-      label: "采购明细",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "其他收费项目",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "otherCharge",
-      label: "其他收费项目",
+      label: "",
     },
     {
       type: "slot",
       slotName: "offerMoney",
     },
     {
+      type: "title",
+      title: "合同条款",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "contractClause",
-      label: "合同条款",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "到货要求",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "shipment",
-      label: "到货要求",
+      label: "",
     },
   ];
 });

src/components/process/EHSD/PurchaseChange.vue

@@ -587,38 +587,68 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "title",
+      title: "付款信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "payment",
-      label: "付款信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "交付信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "delivery",
-      label: "交付信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "采购明细",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "commodity",
-      label: "采购明细",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "其他收费项目",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "otherCharge",
-      label: "其他收费项目",
+      label: "",
     },
     {
       type: "slot",
       slotName: "offerMoney",
     },
     {
+      type: "title",
+      title: "合同条款",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "contractClause",
-      label: "合同条款",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "到货要求",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "shipment",
-      label: "到货要求",
+      label: "",
     },
   ];
 });

src/components/process/EHSD/Sample.vue

@@ -1,63 +1,34 @@
 <template>
   <div style="width: 100%; padding: 0px 15px">
-    <byForm
-      :formConfig="formConfig"
-      :formOption="formOption"
-      v-model="formData.data"
-      :rules="rules"
-      ref="submit"
-    >
+    <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
       <template #btn>
         <div>
-          <el-button
-            type="primary"
-            v-if="
+          <el-button type="primary" v-if="
               [30].includes(route.query.processType) || !route.query.processType
-            "
-            @click="clickCopy"
-            >复制样品单</el-button
-          >
+            " @click="clickCopy">复制样品单</el-button>
         </div>
       </template>
       <template #seller>
         <div style="width: 100%">
           <el-form-item prop="sellCorporationId">
-            <el-select
-              v-model="formData.data.sellCorporationId"
-              style="width: 100%"
-              filterable
-            >
-              <el-option
-                v-for="item in corporationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="formData.data.sellCorporationId" style="width: 100%" filterable>
+              <el-option v-for="item in corporationList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="地址" prop="sellCountryName">
-                <el-input
-                  v-model="formData.data.sellCountryName"
-                  placeholder="请输入国家"
-                />
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellProvinceName">
-                <el-input
-                  v-model="formData.data.sellProvinceName"
-                  placeholder="请输入省/州"
-                />
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellCityName">
-                <el-input
-                  v-model="formData.data.sellCityName"
-                  placeholder="请输入城市"
-                />
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -72,18 +43,12 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="联系人" prop="sellContactName">
-                <el-input
-                  v-model="formData.data.sellContactName"
-                  placeholder="请输入联系人"
-                />
+                <el-input v-model="formData.data.sellContactName" placeholder="请输入联系人" />
               </el-form-item>
             </el-col>
             <el-col :span="16">
               <el-form-item label=" " prop="sellContactNumber">
-                <el-input
-                  v-model="formData.data.sellContactNumber"
-                  placeholder="请输入联系人电话"
-                />
+                <el-input v-model="formData.data.sellContactNumber" placeholder="请输入联系人电话" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -107,87 +72,42 @@
               </el-select>
             </el-form-item> -->
             <el-form-item prop="buyCorporationId">
-              <el-select
-                v-model="formData.data.buyCorporationId"
-                filterable
-                remote
-                reserve-keyword
-                placeholder="请输入关键字"
-                remote-show-suffix
-                :remote-method="remoteMethod"
-                :loading="loadingSearch"
-                @input="remoteMethod"
-                style="width: 100%"
-                @change="changeCustomer"
-                v-if="
+              <el-select v-model="formData.data.buyCorporationId" filterable remote reserve-keyword placeholder="请输入关键字" remote-show-suffix
+                         :remote-method="remoteMethod" :loading="loadingSearch" @input="remoteMethod" style="width: 100%" @change="changeCustomer"
+                         v-if="
                   [30].includes(route.query.processType) ||
                   !route.query.processType
-                "
-              >
-                <el-option
-                  v-for="item in customerList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+                ">
+                <el-option v-for="item in customerList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <el-select
-                v-model="formData.data.buyCorporationName"
-                disabled
-                v-else
-                style="width: 100%"
-              >
+              <el-select v-model="formData.data.buyCorporationName" disabled v-else style="width: 100%">
               </el-select>
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
                 <el-form-item label="地址" prop="countryId">
-                  <el-select
-                    v-model="formData.data.countryId"
-                    placeholder="国家"
-                    filterable
-                    @change="(val) => getCityData(val, '20', true)"
-                  >
-                    <el-option
-                      v-for="item in countryData"
-                      :label="item.name"
-                      :value="item.id"
-                    >
+                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable @change="(val) => getCityData(val, '20', true)">
+                    <el-option v-for="item in countryData" :label="item.name" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="provinceName">
-                  <selectCity
-                    placeholder="省/洲"
-                    @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
-                    addressName="provinceName"
-                    v-model="formData.data"
-                    :data="provinceData"
-                  >
+                  <selectCity placeholder="省/洲" @change="(val) => getCityData(val, '30', true)" addressId="provinceId" addressName="provinceName"
+                              v-model="formData.data" :data="provinceData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity
-                    placeholder="城市"
-                    addressId="cityId"
-                    addressName="cityName"
-                    v-model="formData.data"
-                    :data="cityData"
-                  >
+                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyPostalCode">
-                  <el-input
-                    v-model="formData.data.buyPostalCode"
-                    placeholder="请输入邮编"
-                  />
+                  <el-input v-model="formData.data.buyPostalCode" placeholder="请输入邮编" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -202,23 +122,14 @@
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="8">
                 <el-form-item label="联系人" prop="buyContactName">
-                  <el-autocomplete
-                    v-model="formData.data.buyContactName"
-                    :fetch-suggestions="querySearchPerson"
-                    clearable
-                    class="inline-input w-50"
-                    placeholder="请输入联系人"
-                    @select="handlePerson"
-                  >
+                  <el-autocomplete v-model="formData.data.buyContactName" :fetch-suggestions="querySearchPerson" clearable class="inline-input w-50"
+                                   placeholder="请输入联系人" @select="handlePerson">
                   </el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
                 <el-form-item label=" " prop="buyContactNumber">
-                  <el-input
-                    v-model="formData.data.buyContactNumber"
-                    placeholder="请输入联系人电话"
-                  />
+                  <el-input v-model="formData.data.buyContactNumber" placeholder="请输入联系人电话" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -230,94 +141,45 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="币种" prop="currency">
-                <el-select
-                  v-model="formData.data.currency"
-                  placeholder="请选择币种"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in accountCurrency"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.currency" placeholder="请选择币种" style="width: 100%">
+                  <el-option v-for="item in accountCurrency" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="汇率" prop="rate">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.rate"
-                  placeholder="请输入汇率"
-                  style="width: 100%"
-                  :precision="4"
-                  :controls="false"
-                  :min="0"
-                  :max="100"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.rate" placeholder="请输入汇率" style="width: 100%" :precision="4"
+                                 :controls="false" :min="0" :max="100" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="付款方式" prop="paymentMethod">
-                <el-select
-                  v-model="formData.data.paymentMethod"
-                  placeholder="请选择付款方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in fundsPaymentMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.paymentMethod" placeholder="请选择付款方式" style="width: 100%">
+                  <el-option v-for="item in fundsPaymentMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="预付比例 (%)" prop="advanceRatio">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.advanceRatio"
-                  placeholder="请输入预付比例"
-                  style="width: 100%"
-                  :precision="2"
-                  :controls="false"
-                  :min="0"
-                  :max="100"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.advanceRatio" placeholder="请输入预付比例" style="width: 100%"
+                                 :precision="2" :controls="false" :min="0" :max="100" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="18">
               <el-form-item label="付款条件" prop="remark">
-                <el-input
-                  v-model="formData.data.remark"
-                  :rows="2"
-                  type="textarea"
-                  placeholder="请输入付款条件"
-                />
+                <el-input v-model="formData.data.remark" :rows="2" type="textarea" placeholder="请输入付款条件" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="9">
               <el-form-item label="收款账号" prop="shroffAccountId">
-                <el-select
-                  v-model="formData.data.shroffAccountId"
-                  placeholder="请选择收款账号"
-                  style="width: 100%"
-                  @change="changeShroffAccount"
-                >
-                  <el-option
-                    v-for="item in accountList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.shroffAccountId" placeholder="请选择收款账号" style="width: 100%" @change="changeShroffAccount">
+                  <el-option v-for="item in accountList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -335,62 +197,29 @@
               <el-collapse-item title="" name="1">
                 <el-row style="width: 100%">
                   <el-col :span="9">
-                    <el-form-item
-                      label="Beneficiary Name"
-                      prop="beneficiaryName"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryName"
-                        placeholder="请输入Beneficiary Name"
-                      />
+                    <el-form-item label="Beneficiary Name" prop="beneficiaryName">
+                      <el-input v-model="formData.data.beneficiaryName" placeholder="请输入Beneficiary Name" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Bank"
-                      prop="beneficiaryBank"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryBank"
-                        placeholder="请输入Beneficiary Bank"
-                      />
+                    <el-form-item label="Beneficiary Bank" prop="beneficiaryBank">
+                      <el-input v-model="formData.data.beneficiaryBank" placeholder="请输入Beneficiary Bank" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Bank Address"
-                      prop="beneficiaryBankAddress"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryBankAddress"
-                        placeholder="请输入Beneficiary Bank Address"
-                      />
+                    <el-form-item label="Beneficiary Bank Address" prop="beneficiaryBankAddress">
+                      <el-input v-model="formData.data.beneficiaryBankAddress" placeholder="请输入Beneficiary Bank Address" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="9">
-                    <el-form-item
-                      label="Beneficiary Account Number"
-                      prop="beneficiaryAccountNumber"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryAccountNumber"
-                        placeholder="请输入Beneficiary Account Number"
-                      />
+                    <el-form-item label="Beneficiary Account Number" prop="beneficiaryAccountNumber">
+                      <el-input v-model="formData.data.beneficiaryAccountNumber" placeholder="请输入Beneficiary Account Number" />
                     </el-form-item>
                     <div style="height: 20px"></div>
                     <el-form-item label="Swift Code" prop="swiftCode">
-                      <el-input
-                        v-model="formData.data.swiftCode"
-                        placeholder="请输入Swift Code"
-                      />
+                      <el-input v-model="formData.data.swiftCode" placeholder="请输入Swift Code" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Address"
-                      prop="beneficiaryAddress"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryAddress"
-                        placeholder="请输入Beneficiary Address"
-                      />
+                    <el-form-item label="Beneficiary Address" prop="beneficiaryAddress">
+                      <el-input v-model="formData.data.beneficiaryAddress" placeholder="请输入Beneficiary Address" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -404,49 +233,25 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="报价有效期 (天)" prop="effective">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.effective"
-                  placeholder="请输入有效期"
-                  style="width: 100%"
-                  :precision="0"
-                  :controls="false"
-                  :min="0"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.effective" placeholder="请输入有效期" style="width: 100%"
+                                 :precision="0" :controls="false" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="交货期限" prop="deliveryTime">
-                <el-date-picker
-                  v-model="formData.data.deliveryTime"
-                  type="date"
-                  placeholder="请选择交货期限"
-                  value-format="YYYY-MM-DD"
-                />
+                <el-date-picker v-model="formData.data.deliveryTime" type="date" placeholder="请选择交货期限" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输方式" prop="transportMethod">
-                <el-select
-                  v-model="formData.data.transportMethod"
-                  placeholder="请选择运输方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in shippingMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.transportMethod" placeholder="请选择运输方式" style="width: 100%">
+                  <el-option v-for="item in shippingMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输说明" prop="transportRemark">
-                <el-input
-                  v-model="formData.data.transportRemark"
-                  placeholder="请输入运输说明"
-                />
+                <el-input v-model="formData.data.transportRemark" placeholder="请输入运输说明" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -454,46 +259,24 @@
       </template>
       <template #commodity>
         <div style="width: 100%">
-          <el-button type="primary" @click="openProductCompany = true" plain
-            >标准产品库</el-button
-          >
-          <el-button type="primary" @click="clickCustomerProduct()" plain
-            >客户产品库</el-button
-          >
-          <el-table
-            :data="formData.data.sampleProductList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-button type="primary" @click="openProductCompany = true" plain>标准产品库</el-button>
+          <el-button type="primary" @click="clickCustomerProduct()" plain>客户产品库</el-button>
+          <el-table :data="formData.data.sampleProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
                 <div v-if="row.fileUrl">
-                  <img
-                    :src="row.fileUrl"
-                    class="pic"
-                    @click="onPicture(row.fileUrl)"
-                  />
+                  <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="productCnName"
-              label="商品中文名"
-              min-width="130"
-            />
+            <el-table-column prop="productCnName" label="商品中文名" min-width="130" />
             <el-table-column label="商品英文名" min-width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.productName'"
-                    :rules="rules.productName"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input
-                      v-model="row.productName"
-                      placeholder="请输入商品名称"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.productName'" :rules="rules.productName" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input v-model="row.productName" placeholder="请输入商品名称" />
                   </el-form-item>
                 </div>
               </template>
@@ -501,12 +284,8 @@
             <el-table-column label="尺寸 cm*cm*cm" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.productModel'"
-                    :rules="rules.productModel"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'sampleProductList.' + $index + '.productModel'" :rules="rules.productModel" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.productModel" placeholder="请输入" />
                   </el-form-item>
                 </div>
@@ -515,22 +294,10 @@
             <el-table-column label="数量" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.quantity'"
-                    :rules="rules.quantity"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.quantity"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="0"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount('quantity')"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.quantity" placeholder="请输入" style="width: 100%" :precision="0"
+                                     :controls="false" :min="0" @change="calculationAmount('quantity')" />
                   </el-form-item>
                 </div>
               </template>
@@ -538,22 +305,9 @@
             <el-table-column label="单价" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.price'"
-                    :rules="rules.price"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.price"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount()"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.price'" :rules="rules.price" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.price" placeholder="请输入" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="calculationAmount()" />
                   </el-form-item>
                 </div>
               </template>
@@ -561,23 +315,10 @@
             <el-table-column label="贸易方式" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.tradeMethods'"
-                    :rules="rules.tradeMethods"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-select
-                      v-model="row.tradeMethods"
-                      placeholder="请选择"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in tradeMethods"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.tradeMethods'" :rules="rules.tradeMethods" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-select v-model="row.tradeMethods" placeholder="请选择" style="width: 100%">
+                      <el-option v-for="item in tradeMethods" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -586,35 +327,17 @@
             <el-table-column label="包装方式" width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.packMethod'"
-                    :rules="rules.packMethod"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'sampleProductList.' + $index + '.packMethod'" :rules="rules.packMethod" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.packMethod" placeholder="请输入" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="amount"
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-            />
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column prop="amount" :label="'金额 ( ' + formData.data.currency + ' )'" width="130" />
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ row, $index }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="handleRemove($index, row)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleRemove($index, row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -622,30 +345,17 @@
       </template>
       <template #file>
         <div style="width: 100%">
-          <el-upload
-            v-model:fileList="formData.data.fileList"
-            action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-            :data="uploadData"
-            multiple
-            :before-upload="uploadFile"
-            :on-success="handleSuccess"
-            :on-preview="onPreviewFile"
-          >
+          <el-upload v-model:fileList="formData.data.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
+                     :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
       </template>
       <template #indication>
         <div style="width: 100%">
-          <el-upload
-            v-model:fileList="formData.data.packageFileList"
-            action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-            :data="indicationUploadData"
-            multiple
-            :before-upload="indicationUploadFile"
-            :on-success="handleSuccess"
-            :on-preview="onPreviewFile"
-          >
+          <el-upload v-model:fileList="formData.data.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                     :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
+                     :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
@@ -653,25 +363,13 @@
       <template #otherCharge>
         <div style="width: 100%">
           <el-button type="primary" @click="clickAdd()">添加行</el-button>
-          <el-table
-            :data="formData.data.sampleProjectList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-table :data="formData.data.sampleProjectList" style="width: 100%; margin-top: 16px">
             <el-table-column label="收费项目" width="220">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.payName'"
-                    :rules="rules.payName"
-                    :inline-message="true"
-                  >
-                    <el-autocomplete
-                      v-model="row.payName"
-                      :fetch-suggestions="querySearch"
-                      clearable
-                      class="inline-input w-50"
-                      placeholder="请输入收费项目"
-                    />
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.payName'" :rules="rules.payName" :inline-message="true">
+                    <el-autocomplete v-model="row.payName" :fetch-suggestions="querySearch" clearable class="inline-input w-50"
+                                     placeholder="请输入收费项目" />
                   </el-form-item>
                 </div>
               </template>
@@ -679,50 +377,25 @@
             <el-table-column label="备注">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.remark'"
-                  >
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.remark'">
                     <el-input v-model="row.remark" placeholder="请输入备注" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-            >
+            <el-table-column :label="'金额 ( ' + formData.data.currency + ' )'" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.amount'"
-                    :rules="rules.amount"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.amount"
-                      placeholder="请输入金额"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="totalAmount()"
-                    />
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.amount'" :rules="rules.amount" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.amount" placeholder="请输入金额" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="totalAmount()" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ $index }">
-                <el-button type="primary" link @click="handleDelete($index)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -732,16 +405,8 @@
         <div style="width: 100%; display: flex">
           <div style="width: calc(100% - 190px)"></div>
           <div style="width: 130px; padding: 0 12px">
-            <el-form-item
-              label="合同总金额"
-              prop="amount"
-              class="shrinkPadding"
-            >
-              <el-input
-                v-model="formData.data.amount"
-                placeholder="合同总金额"
-                disabled
-              />
+            <el-form-item label="合同总金额" prop="amount" class="shrinkPadding">
+              <el-input v-model="formData.data.amount" placeholder="合同总金额" disabled />
             </el-form-item>
           </div>
         </div>
@@ -814,38 +479,18 @@
           <el-row>
             <el-col :span="10" style="border: 1px solid #ebeef5; padding: 10px">
               <el-form-item label="出货日期" required>
-                <el-date-picker
-                  v-model="formData.data.shipmentTime"
-                  type="date"
-                  placeholder="请选择出货日期"
-                  value-format="YYYY-MM-DD"
-                />
+                <el-date-picker v-model="formData.data.shipmentTime" type="date" placeholder="请选择出货日期" value-format="YYYY-MM-DD" />
               </el-form-item>
-              <el-table
-                :data="formData.data.sampleWaitShipmentList"
-                @selection-change="handleSelectionChange"
-                ref="tableDom"
-                style="margin: 15px 0"
-              >
+              <el-table :data="formData.data.sampleWaitShipmentList" @selection-change="handleSelectionChange" ref="tableDom" style="margin: 15px 0">
                 <el-table-column type="selection" width="55" />
                 <el-table-column prop="productCode" label="商品编号" />
                 <el-table-column prop="productName" label="商品名称" />
                 <el-table-column label="出货数量" width="160">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
-                      <el-form-item
-                        :prop="'sampleWaitShipmentList.' + $index + '.quantity'"
-                        :inline-message="true"
-                      >
-                        <el-input-number
-                          onmousewheel="return false;"
-                          v-model="row.quantity"
-                          placeholder="请输入数量"
-                          style="width: 100%"
-                          :precision="0"
-                          :controls="false"
-                          :min="0"
-                        />
+                      <el-form-item :prop="'sampleWaitShipmentList.' + $index + '.quantity'" :inline-message="true">
+                        <el-input-number onmousewheel="return false;" v-model="row.quantity" placeholder="请输入数量" style="width: 100%" :precision="0"
+                                         :controls="false" :min="0" />
                       </el-form-item>
                     </div>
                   </template>
@@ -853,40 +498,21 @@
                 <el-table-column prop="waitQuantity" label="剩余数量" />
               </el-table>
               <div style="text-align: center">
-                <el-button type="primary" @click="handleAddShipment"
-                  >添加</el-button
-                >
+                <el-button type="primary" @click="handleAddShipment">添加</el-button>
               </div>
             </el-col>
             <el-col :span="14">
               <div style="padding: 10px; margin-top: 77px">
-                <el-table
-                  :data="formData.data.sampleShipmentList"
-                  :span-method="objectSpanMethod"
-                >
-                  <el-table-column
-                    prop="shipmentTime"
-                    label="出货日期"
-                    width="155"
-                  >
+                <el-table :data="formData.data.sampleShipmentList" :span-method="objectSpanMethod">
+                  <el-table-column prop="shipmentTime" label="出货日期" width="155">
                   </el-table-column>
                   <el-table-column prop="productCode" label="商品编码" />
                   <el-table-column prop="productName" label="商品名称" />
                   <el-table-column prop="quantity" label="出货数量" width="160">
                   </el-table-column>
-                  <el-table-column
-                    align="center"
-                    label="操作"
-                    width="80"
-                    fixed="right"
-                  >
+                  <el-table-column align="center" label="操作" width="80" fixed="right">
                     <template #default="{ row, $index }">
-                      <el-button
-                        type="primary"
-                        link
-                        @click="clickDelete($index)"
-                        >删除</el-button
-                      >
+                      <el-button type="primary" link @click="clickDelete($index)">删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -897,40 +523,15 @@
       </template>
     </byForm>
 
-    <el-dialog
-      v-if="openProductCompany"
-      v-model="openProductCompany"
-      title="公司产品库"
-      width="90%"
-      append-to-body
-    >
-      <CompanyProduct
-        :selectStatus="true"
-        @selectProduct="selectProduct"
-      ></CompanyProduct>
+    <el-dialog v-if="openProductCompany" v-model="openProductCompany" title="公司产品库" width="90%" append-to-body>
+      <CompanyProduct :selectStatus="true" @selectProduct="selectProduct"></CompanyProduct>
     </el-dialog>
 
-    <el-dialog
-      v-if="openProductCustomer"
-      v-model="openProductCustomer"
-      title="客户产品库"
-      width="90%"
-      append-to-body
-    >
-      <CustomerProduct
-        :selectStatus="true"
-        :buyCorporationId="formData.data.buyCorporationId"
-        @selectProduct="selectProduct"
-      ></CustomerProduct>
+    <el-dialog v-if="openProductCustomer" v-model="openProductCustomer" title="客户产品库" width="90%" append-to-body>
+      <CustomerProduct :selectStatus="true" :buyCorporationId="formData.data.buyCorporationId" @selectProduct="selectProduct"></CustomerProduct>
     </el-dialog>
 
-    <el-dialog
-      v-if="copyContract"
-      v-model="copyContract"
-      title="样品单选择"
-      width="90%"
-      append-to-body
-    >
+    <el-dialog v-if="copyContract" v-model="copyContract" title="样品单选择" width="90%" append-to-body>
       <SelectSample @select="selectSample"></SelectSample>
     </el-dialog>
   </div>
@@ -1040,19 +641,34 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "title",
+      title: "付款信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "payment",
-      label: "付款信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "交付信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "delivery",
-      label: "交付信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "商品信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "commodity",
-      label: "商品信息",
+      label: "",
     },
     {
       type: "slot",
@@ -1065,18 +681,28 @@ const formConfig = computed(() => {
       label: "包装指示",
     },
     {
+      type: "title",
+      title: "其他收费项目",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "otherCharge",
-      label: "其他收费项目",
+      label: "",
     },
     {
       type: "slot",
       slotName: "offerMoney",
     },
     {
+      type: "title",
+      title: "出货计划",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "shipment",
-      label: "出货计划",
+      label: "",
     },
     // {
     //   type: "select",

src/components/process/EHSD/SampleChange.vue

@@ -1,51 +1,27 @@
 <template>
   <div style="width: 100%; padding: 0px 15px">
-    <byForm
-      :formConfig="formConfig"
-      :formOption="formOption"
-      v-model="formData.data"
-      :rules="rules"
-      ref="submit"
-    >
+    <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
       <template #seller>
         <div style="width: 100%">
           <el-form-item prop="sellCorporationId">
-            <el-select
-              v-model="formData.data.sellCorporationId"
-              style="width: 100%"
-              filterable
-            >
-              <el-option
-                v-for="item in corporationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="formData.data.sellCorporationId" style="width: 100%" filterable>
+              <el-option v-for="item in corporationList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="地址" prop="sellCountryName">
-                <el-input
-                  v-model="formData.data.sellCountryName"
-                  placeholder="请输入国家"
-                />
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellProvinceName">
-                <el-input
-                  v-model="formData.data.sellProvinceName"
-                  placeholder="请输入省/州"
-                />
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label=" " prop="sellCityName">
-                <el-input
-                  v-model="formData.data.sellCityName"
-                  placeholder="请输入城市"
-                />
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -60,18 +36,12 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
               <el-form-item label="联系人" prop="sellContactName">
-                <el-input
-                  v-model="formData.data.sellContactName"
-                  placeholder="请输入联系人"
-                />
+                <el-input v-model="formData.data.sellContactName" placeholder="请输入联系人" />
               </el-form-item>
             </el-col>
             <el-col :span="16">
               <el-form-item label=" " prop="sellContactNumber">
-                <el-input
-                  v-model="formData.data.sellContactNumber"
-                  placeholder="请输入联系人电话"
-                />
+                <el-input v-model="formData.data.sellContactNumber" placeholder="请输入联系人电话" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -95,87 +65,42 @@
               </el-select>
             </el-form-item> -->
             <el-form-item prop="buyCorporationId">
-              <el-select
-                v-model="formData.data.buyCorporationId"
-                filterable
-                remote
-                reserve-keyword
-                placeholder="请输入关键字"
-                remote-show-suffix
-                :remote-method="remoteMethod"
-                :loading="loadingSearch"
-                @input="remoteMethod"
-                style="width: 100%"
-                @change="changeCustomer"
-                v-if="
+              <el-select v-model="formData.data.buyCorporationId" filterable remote reserve-keyword placeholder="请输入关键字" remote-show-suffix
+                         :remote-method="remoteMethod" :loading="loadingSearch" @input="remoteMethod" style="width: 100%" @change="changeCustomer"
+                         v-if="
                   [30].includes(route.query.processType) ||
                   !route.query.processType
-                "
-              >
-                <el-option
-                  v-for="item in customerList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+                ">
+                <el-option v-for="item in customerList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <el-select
-                v-model="formData.data.buyCorporationName"
-                disabled
-                v-else
-                style="width: 100%"
-              >
+              <el-select v-model="formData.data.buyCorporationName" disabled v-else style="width: 100%">
               </el-select>
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
                 <el-form-item label="地址" prop="countryId">
-                  <el-select
-                    v-model="formData.data.countryId"
-                    placeholder="国家"
-                    filterable
-                    @change="(val) => getCityData(val, '20', true)"
-                  >
-                    <el-option
-                      v-for="item in countryData"
-                      :label="item.name"
-                      :value="item.id"
-                    >
+                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable @change="(val) => getCityData(val, '20', true)">
+                    <el-option v-for="item in countryData" :label="item.name" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="provinceName">
-                  <selectCity
-                    placeholder="省/洲"
-                    @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
-                    addressName="provinceName"
-                    v-model="formData.data"
-                    :data="provinceData"
-                  >
+                  <selectCity placeholder="省/洲" @change="(val) => getCityData(val, '30', true)" addressId="provinceId" addressName="provinceName"
+                              v-model="formData.data" :data="provinceData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity
-                    placeholder="城市"
-                    addressId="cityId"
-                    addressName="cityName"
-                    v-model="formData.data"
-                    :data="cityData"
-                  >
+                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData">
                   </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyPostalCode">
-                  <el-input
-                    v-model="formData.data.buyPostalCode"
-                    placeholder="请输入邮编"
-                  />
+                  <el-input v-model="formData.data.buyPostalCode" placeholder="请输入邮编" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -190,23 +115,14 @@
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="8">
                 <el-form-item label="联系人" prop="buyContactName">
-                  <el-autocomplete
-                    v-model="formData.data.buyContactName"
-                    :fetch-suggestions="querySearchPerson"
-                    clearable
-                    class="inline-input w-50"
-                    placeholder="请输入联系人"
-                    @select="handlePerson"
-                  >
+                  <el-autocomplete v-model="formData.data.buyContactName" :fetch-suggestions="querySearchPerson" clearable class="inline-input w-50"
+                                   placeholder="请输入联系人" @select="handlePerson">
                   </el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
                 <el-form-item label=" " prop="buyContactNumber">
-                  <el-input
-                    v-model="formData.data.buyContactNumber"
-                    placeholder="请输入联系人电话"
-                  />
+                  <el-input v-model="formData.data.buyContactNumber" placeholder="请输入联系人电话" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -218,94 +134,45 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="币种" prop="currency">
-                <el-select
-                  v-model="formData.data.currency"
-                  placeholder="请选择币种"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in accountCurrency"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.currency" placeholder="请选择币种" style="width: 100%">
+                  <el-option v-for="item in accountCurrency" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="汇率" prop="rate">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.rate"
-                  placeholder="请输入汇率"
-                  style="width: 100%"
-                  :precision="4"
-                  :controls="false"
-                  :min="0"
-                  :max="100"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.rate" placeholder="请输入汇率" style="width: 100%" :precision="4"
+                                 :controls="false" :min="0" :max="100" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6">
               <el-form-item label="付款方式" prop="paymentMethod">
-                <el-select
-                  v-model="formData.data.paymentMethod"
-                  placeholder="请选择付款方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in fundsPaymentMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.paymentMethod" placeholder="请选择付款方式" style="width: 100%">
+                  <el-option v-for="item in fundsPaymentMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="预付比例 (%)" prop="advanceRatio">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.advanceRatio"
-                  placeholder="请输入预付比例"
-                  style="width: 100%"
-                  :precision="2"
-                  :controls="false"
-                  :min="0"
-                  :max="100"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.advanceRatio" placeholder="请输入预付比例" style="width: 100%"
+                                 :precision="2" :controls="false" :min="0" :max="100" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="18">
               <el-form-item label="付款条件" prop="remark">
-                <el-input
-                  v-model="formData.data.remark"
-                  :rows="2"
-                  type="textarea"
-                  placeholder="请输入付款条件"
-                />
+                <el-input v-model="formData.data.remark" :rows="2" type="textarea" placeholder="请输入付款条件" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="9">
               <el-form-item label="收款账号" prop="shroffAccountId">
-                <el-select
-                  v-model="formData.data.shroffAccountId"
-                  placeholder="请选择收款账号"
-                  style="width: 100%"
-                  @change="changeShroffAccount"
-                >
-                  <el-option
-                    v-for="item in accountList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.shroffAccountId" placeholder="请选择收款账号" style="width: 100%" @change="changeShroffAccount">
+                  <el-option v-for="item in accountList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -323,62 +190,29 @@
               <el-collapse-item title="" name="1">
                 <el-row style="width: 100%">
                   <el-col :span="9">
-                    <el-form-item
-                      label="Beneficiary Name"
-                      prop="beneficiaryName"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryName"
-                        placeholder="请输入Beneficiary Name"
-                      />
+                    <el-form-item label="Beneficiary Name" prop="beneficiaryName">
+                      <el-input v-model="formData.data.beneficiaryName" placeholder="请输入Beneficiary Name" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Bank"
-                      prop="beneficiaryBank"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryBank"
-                        placeholder="请输入Beneficiary Bank"
-                      />
+                    <el-form-item label="Beneficiary Bank" prop="beneficiaryBank">
+                      <el-input v-model="formData.data.beneficiaryBank" placeholder="请输入Beneficiary Bank" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Bank Address"
-                      prop="beneficiaryBankAddress"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryBankAddress"
-                        placeholder="请输入Beneficiary Bank Address"
-                      />
+                    <el-form-item label="Beneficiary Bank Address" prop="beneficiaryBankAddress">
+                      <el-input v-model="formData.data.beneficiaryBankAddress" placeholder="请输入Beneficiary Bank Address" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="9">
-                    <el-form-item
-                      label="Beneficiary Account Number"
-                      prop="beneficiaryAccountNumber"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryAccountNumber"
-                        placeholder="请输入Beneficiary Account Number"
-                      />
+                    <el-form-item label="Beneficiary Account Number" prop="beneficiaryAccountNumber">
+                      <el-input v-model="formData.data.beneficiaryAccountNumber" placeholder="请输入Beneficiary Account Number" />
                     </el-form-item>
                     <div style="height: 20px"></div>
                     <el-form-item label="Swift Code" prop="swiftCode">
-                      <el-input
-                        v-model="formData.data.swiftCode"
-                        placeholder="请输入Swift Code"
-                      />
+                      <el-input v-model="formData.data.swiftCode" placeholder="请输入Swift Code" />
                     </el-form-item>
                     <div style="height: 20px"></div>
-                    <el-form-item
-                      label="Beneficiary Address"
-                      prop="beneficiaryAddress"
-                    >
-                      <el-input
-                        v-model="formData.data.beneficiaryAddress"
-                        placeholder="请输入Beneficiary Address"
-                      />
+                    <el-form-item label="Beneficiary Address" prop="beneficiaryAddress">
+                      <el-input v-model="formData.data.beneficiaryAddress" placeholder="请输入Beneficiary Address" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -392,49 +226,25 @@
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="6" v-show="showAllData">
               <el-form-item label="报价有效期 (天)" prop="effective">
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="formData.data.effective"
-                  placeholder="请输入有效期"
-                  style="width: 100%"
-                  :precision="0"
-                  :controls="false"
-                  :min="0"
-                />
+                <el-input-number onmousewheel="return false;" v-model="formData.data.effective" placeholder="请输入有效期" style="width: 100%"
+                                 :precision="0" :controls="false" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="交货期限" prop="deliveryTime">
-                <el-date-picker
-                  v-model="formData.data.deliveryTime"
-                  type="date"
-                  placeholder="请选择交货期限"
-                  value-format="YYYY-MM-DD"
-                />
+                <el-date-picker v-model="formData.data.deliveryTime" type="date" placeholder="请选择交货期限" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输方式" prop="transportMethod">
-                <el-select
-                  v-model="formData.data.transportMethod"
-                  placeholder="请选择运输方式"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in shippingMethod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
+                <el-select v-model="formData.data.transportMethod" placeholder="请选择运输方式" style="width: 100%">
+                  <el-option v-for="item in shippingMethod" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="运输说明" prop="transportRemark">
-                <el-input
-                  v-model="formData.data.transportRemark"
-                  placeholder="请输入运输说明"
-                />
+                <el-input v-model="formData.data.transportRemark" placeholder="请输入运输说明" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -442,46 +252,24 @@
       </template>
       <template #commodity>
         <div style="width: 100%">
-          <el-button type="primary" @click="openProductCompany = true" plain
-            >标准产品库</el-button
-          >
-          <el-button type="primary" @click="clickCustomerProduct()" plain
-            >客户产品库</el-button
-          >
-          <el-table
-            :data="formData.data.sampleProductList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-button type="primary" @click="openProductCompany = true" plain>标准产品库</el-button>
+          <el-button type="primary" @click="clickCustomerProduct()" plain>客户产品库</el-button>
+          <el-table :data="formData.data.sampleProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
                 <div v-if="row.fileUrl">
-                  <img
-                    :src="row.fileUrl"
-                    class="pic"
-                    @click="onPicture(row.fileUrl)"
-                  />
+                  <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="productCnName"
-              label="商品中文名"
-              min-width="130"
-            />
+            <el-table-column prop="productCnName" label="商品中文名" min-width="130" />
             <el-table-column label="商品英文名" min-width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.productName'"
-                    :rules="rules.productName"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input
-                      v-model="row.productName"
-                      placeholder="请输入商品名称"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.productName'" :rules="rules.productName" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input v-model="row.productName" placeholder="请输入商品名称" />
                   </el-form-item>
                 </div>
               </template>
@@ -489,12 +277,8 @@
             <el-table-column label="尺寸 cm*cm*cm" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.productModel'"
-                    :rules="rules.productModel"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'sampleProductList.' + $index + '.productModel'" :rules="rules.productModel" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.productModel" placeholder="请输入" />
                   </el-form-item>
                 </div>
@@ -503,22 +287,10 @@
             <el-table-column label="数量" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.quantity'"
-                    :rules="rules.quantity"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.quantity"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="0"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount('quantity')"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.quantity" placeholder="请输入" style="width: 100%" :precision="0"
+                                     :controls="false" :min="0" @change="calculationAmount('quantity')" />
                   </el-form-item>
                 </div>
               </template>
@@ -526,22 +298,9 @@
             <el-table-column label="单价" width="140" v-if="showAllData">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.price'"
-                    :rules="rules.price"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.price"
-                      placeholder="请输入"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="calculationAmount()"
-                    />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.price'" :rules="rules.price" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.price" placeholder="请输入" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="calculationAmount()" />
                   </el-form-item>
                 </div>
               </template>
@@ -549,23 +308,10 @@
             <el-table-column label="贸易方式" width="140" v-if="showAllData">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.tradeMethods'"
-                    :rules="rules.tradeMethods"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-select
-                      v-model="row.tradeMethods"
-                      placeholder="请选择"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in tradeMethods"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
+                  <el-form-item :prop="'sampleProductList.' + $index + '.tradeMethods'" :rules="rules.tradeMethods" :inline-message="true"
+                                class="shrinkPadding">
+                    <el-select v-model="row.tradeMethods" placeholder="请选择" style="width: 100%">
+                      <el-option v-for="item in tradeMethods" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -574,36 +320,17 @@
             <el-table-column label="包装方式" width="180">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProductList.' + $index + '.packMethod'"
-                    :rules="rules.packMethod"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
+                  <el-form-item :prop="'sampleProductList.' + $index + '.packMethod'" :rules="rules.packMethod" :inline-message="true"
+                                class="shrinkPadding">
                     <el-input v-model="row.packMethod" placeholder="请输入" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="amount"
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-              v-if="showAllData"
-            />
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column prop="amount" :label="'金额 ( ' + formData.data.currency + ' )'" width="130" v-if="showAllData" />
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ row, $index }">
-                <el-button
-                  type="primary"
-                  link
-                  @click="handleRemove($index, row)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleRemove($index, row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -611,30 +338,17 @@
       </template>
       <template #file>
         <div style="width: 100%">
-          <el-upload
-            v-model:fileList="formData.data.fileList"
-            action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-            :data="uploadData"
-            multiple
-            :before-upload="uploadFile"
-            :on-success="handleSuccess"
-            :on-preview="onPreviewFile"
-          >
+          <el-upload v-model:fileList="formData.data.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
+                     :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
       </template>
       <template #indication>
         <div style="width: 100%">
-          <el-upload
-            v-model:fileList="formData.data.packageFileList"
-            action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-            :data="indicationUploadData"
-            multiple
-            :before-upload="indicationUploadFile"
-            :on-success="handleSuccess"
-            :on-preview="onPreviewFile"
-          >
+          <el-upload v-model:fileList="formData.data.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                     :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
+                     :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
@@ -642,25 +356,13 @@
       <template #otherCharge>
         <div style="width: 100%">
           <el-button type="primary" @click="clickAdd()">添加行</el-button>
-          <el-table
-            :data="formData.data.sampleProjectList"
-            style="width: 100%; margin-top: 16px"
-          >
+          <el-table :data="formData.data.sampleProjectList" style="width: 100%; margin-top: 16px">
             <el-table-column label="收费项目" width="220">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.payName'"
-                    :rules="rules.payName"
-                    :inline-message="true"
-                  >
-                    <el-autocomplete
-                      v-model="row.payName"
-                      :fetch-suggestions="querySearch"
-                      clearable
-                      class="inline-input w-50"
-                      placeholder="请输入收费项目"
-                    />
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.payName'" :rules="rules.payName" :inline-message="true">
+                    <el-autocomplete v-model="row.payName" :fetch-suggestions="querySearch" clearable class="inline-input w-50"
+                                     placeholder="请输入收费项目" />
                   </el-form-item>
                 </div>
               </template>
@@ -668,50 +370,25 @@
             <el-table-column label="备注">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.remark'"
-                  >
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.remark'">
                     <el-input v-model="row.remark" placeholder="请输入备注" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="'金额 ( ' + formData.data.currency + ' )'"
-              width="130"
-            >
+            <el-table-column :label="'金额 ( ' + formData.data.currency + ' )'" width="130">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-form-item
-                    :prop="'sampleProjectList.' + $index + '.amount'"
-                    :rules="rules.amount"
-                    :inline-message="true"
-                    class="shrinkPadding"
-                  >
-                    <el-input-number
-                      onmousewheel="return false;"
-                      v-model="row.amount"
-                      placeholder="请输入金额"
-                      style="width: 100%"
-                      :precision="2"
-                      :controls="false"
-                      :min="0"
-                      @change="totalAmount()"
-                    />
+                  <el-form-item :prop="'sampleProjectList.' + $index + '.amount'" :rules="rules.amount" :inline-message="true" class="shrinkPadding">
+                    <el-input-number onmousewheel="return false;" v-model="row.amount" placeholder="请输入金额" style="width: 100%" :precision="2"
+                                     :controls="false" :min="0" @change="totalAmount()" />
                   </el-form-item>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="操作"
-              width="60"
-              align="center"
-              fixed="right"
-            >
+            <el-table-column label="操作" width="60" align="center" fixed="right">
               <template #default="{ $index }">
-                <el-button type="primary" link @click="handleDelete($index)"
-                  >删除</el-button
-                >
+                <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -721,16 +398,8 @@
         <div style="width: 100%; display: flex">
           <div style="width: calc(100% - 190px)"></div>
           <div style="width: 130px; padding: 0 12px">
-            <el-form-item
-              label="合同总金额"
-              prop="amount"
-              class="shrinkPadding"
-            >
-              <el-input
-                v-model="formData.data.amount"
-                placeholder="合同总金额"
-                disabled
-              />
+            <el-form-item label="合同总金额" prop="amount" class="shrinkPadding">
+              <el-input v-model="formData.data.amount" placeholder="合同总金额" disabled />
             </el-form-item>
           </div>
         </div>
@@ -804,38 +473,18 @@
           <el-row>
             <el-col :span="10" style="border: 1px solid #ebeef5; padding: 10px">
               <el-form-item label="出货日期" required>
-                <el-date-picker
-                  v-model="formData.data.shipmentTime"
-                  type="date"
-                  placeholder="请选择出货日期"
-                  value-format="YYYY-MM-DD"
-                />
+                <el-date-picker v-model="formData.data.shipmentTime" type="date" placeholder="请选择出货日期" value-format="YYYY-MM-DD" />
               </el-form-item>
-              <el-table
-                :data="formData.data.sampleWaitShipmentList"
-                @selection-change="handleSelectionChange"
-                ref="tableDom"
-                style="margin: 15px 0"
-              >
+              <el-table :data="formData.data.sampleWaitShipmentList" @selection-change="handleSelectionChange" ref="tableDom" style="margin: 15px 0">
                 <el-table-column type="selection" width="55" />
                 <el-table-column prop="productCode" label="商品编号" />
                 <el-table-column prop="productName" label="商品名称" />
                 <el-table-column label="出货数量" width="160">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
-                      <el-form-item
-                        :prop="'sampleWaitShipmentList.' + $index + '.quantity'"
-                        :inline-message="true"
-                      >
-                        <el-input-number
-                          onmousewheel="return false;"
-                          v-model="row.quantity"
-                          placeholder="请输入数量"
-                          style="width: 100%"
-                          :precision="0"
-                          :controls="false"
-                          :min="0"
-                        />
+                      <el-form-item :prop="'sampleWaitShipmentList.' + $index + '.quantity'" :inline-message="true">
+                        <el-input-number onmousewheel="return false;" v-model="row.quantity" placeholder="请输入数量" style="width: 100%" :precision="0"
+                                         :controls="false" :min="0" />
                       </el-form-item>
                     </div>
                   </template>
@@ -843,40 +492,21 @@
                 <el-table-column prop="waitQuantity" label="剩余数量" />
               </el-table>
               <div style="text-align: center">
-                <el-button type="primary" @click="handleAddShipment"
-                  >添加</el-button
-                >
+                <el-button type="primary" @click="handleAddShipment">添加</el-button>
               </div>
             </el-col>
             <el-col :span="14">
               <div style="padding: 10px; margin-top: 77px">
-                <el-table
-                  :data="formData.data.sampleShipmentList"
-                  :span-method="objectSpanMethod"
-                >
-                  <el-table-column
-                    prop="shipmentTime"
-                    label="出货日期"
-                    width="155"
-                  >
+                <el-table :data="formData.data.sampleShipmentList" :span-method="objectSpanMethod">
+                  <el-table-column prop="shipmentTime" label="出货日期" width="155">
                   </el-table-column>
                   <el-table-column prop="productCode" label="商品编码" />
                   <el-table-column prop="productName" label="商品名称" />
                   <el-table-column prop="quantity" label="出货数量" width="160">
                   </el-table-column>
-                  <el-table-column
-                    align="center"
-                    label="操作"
-                    width="80"
-                    fixed="right"
-                  >
+                  <el-table-column align="center" label="操作" width="80" fixed="right">
                     <template #default="{ row, $index }">
-                      <el-button
-                        type="primary"
-                        link
-                        @click="clickDelete($index)"
-                        >删除</el-button
-                      >
+                      <el-button type="primary" link @click="clickDelete($index)">删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -887,31 +517,12 @@
       </template>
     </byForm>
 
-    <el-dialog
-      v-if="openProductCompany"
-      v-model="openProductCompany"
-      title="公司产品库"
-      width="90%"
-      append-to-body
-    >
-      <CompanyProduct
-        :selectStatus="true"
-        @selectProduct="selectProduct"
-      ></CompanyProduct>
+    <el-dialog v-if="openProductCompany" v-model="openProductCompany" title="公司产品库" width="90%" append-to-body>
+      <CompanyProduct :selectStatus="true" @selectProduct="selectProduct"></CompanyProduct>
     </el-dialog>
 
-    <el-dialog
-      v-if="openProductCustomer"
-      v-model="openProductCustomer"
-      title="客户产品库"
-      width="90%"
-      append-to-body
-    >
-      <CustomerProduct
-        :selectStatus="true"
-        :buyCorporationId="formData.data.buyCorporationId"
-        @selectProduct="selectProduct"
-      ></CustomerProduct>
+    <el-dialog v-if="openProductCustomer" v-model="openProductCustomer" title="客户产品库" width="90%" append-to-body>
+      <CustomerProduct :selectStatus="true" :buyCorporationId="formData.data.buyCorporationId" @selectProduct="selectProduct"></CustomerProduct>
     </el-dialog>
   </div>
 </template>
@@ -1018,20 +629,36 @@ const formConfig = computed(() => {
       isShow: showAllData.value,
     },
     {
+      type: "title",
+      title: "付款信息",
+      haveLine: true,
+      isShow: showAllData.value,
+    },
+    {
       type: "slot",
       slotName: "payment",
-      label: "付款信息",
+      label: "",
       isShow: showAllData.value,
     },
     {
+      type: "title",
+      title: "交付信息",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "delivery",
-      label: "交付信息",
+      label: "",
+    },
+    {
+      type: "title",
+      title: "商品信息",
+      haveLine: true,
     },
     {
       type: "slot",
       slotName: "commodity",
-      label: "商品信息",
+      label: "",
     },
     {
       type: "slot",
@@ -1044,9 +671,15 @@ const formConfig = computed(() => {
       label: "包装指示",
     },
     {
+      type: "title",
+      title: "其他收费项目",
+      haveLine: true,
+      isShow: showAllData.value,
+    },
+    {
       type: "slot",
       slotName: "otherCharge",
-      label: "其他收费项目",
+      label: "",
       isShow: showAllData.value,
     },
     {
@@ -1055,9 +688,14 @@ const formConfig = computed(() => {
       isShow: showAllData.value,
     },
     {
+      type: "title",
+      title: "出货计划",
+      haveLine: true,
+    },
+    {
       type: "slot",
       slotName: "shipment",
-      label: "出货计划",
+      label: "",
     },
     // {
     //   type: "select",

src/components/process/PurchasePayment.vue

@@ -232,10 +232,15 @@ const formConfig = computed(() => {
       label: "上传附件",
     },
     {
+      type: "title",
+      title: "付款明细",
+      haveLine: true,
+    },
+    {
       type: "slot",
       prop: "payDetailList",
       slotName: "payDetailList",
-      label: "付款明细",
+      label: "",
     },
     {
       type: "input",
@@ -246,8 +251,11 @@ const formConfig = computed(() => {
       disabled: true,
       itemWidth: 50,
     },
+
     {
-      label: "收款信息",
+      type: "title",
+      title: "收款信息",
+      haveLine: true,
     },
     {
       type: "select",

src/components/process/SendPurchase.vue

@@ -1,7 +1,10 @@
 <template>
   <div style="width: 100%; padding: 0px 15px">
     <el-form :model="formData.data" :rules="rules" ref="formDom" label-position="top" :disabled="judgeStatus()">
-      <div class="_t">基础信息</div>
+      <!-- <div class="_t">基础信息</div> -->
+      <div style="margin-left:-15px;margin-bottom:15px">
+        <TitleInfo :content="'基础信息'"></TitleInfo>
+      </div>
       <el-row :gutter="10">
         <el-col :span="6">
           <el-form-item label="采购部门" prop="deptName">
@@ -52,7 +55,13 @@
         <el-input v-model="formData.data.remark" placeholder="请输入" type="textarea">
         </el-input>
       </el-form-item>
-      <div class="_t">采购明细</div>
+      <!-- <div class="_t">采购明细</div> -->
+      <div style="width:100%">
+        <div style="width:calc(100% + 80px);margin-left:-45px;background:#F0F2F5;height:15px"></div>
+        <div :style="{marginTop:true?'15px':''}" style="margin-left:-15px;margin-bottom:15px">
+          <TitleInfo :content="'采购明细'"></TitleInfo>
+        </div>
+      </div>
       <el-form-item>
         <!-- <el-button
           type="primary"
@@ -101,7 +110,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="_t">其他收费项目</div>
+      <!-- <div class="_t">其他收费项目</div> -->
+      <div style="width:100%">
+        <div style="width:calc(100% + 80px);margin-left:-45px;background:#F0F2F5;height:15px"></div>
+        <div :style="{marginTop:true?'15px':''}" style="margin-left:-15px;margin-bottom:15px">
+          <TitleInfo :content="'其他收费项目'"></TitleInfo>
+        </div>
+      </div>
       <el-form-item>
         <el-button type="primary" style="margin: 10px 0" @click="handleAdd">
           添加
@@ -166,6 +181,7 @@ import SelectGoods from "@/components/product/SelectGoods";
 import { ElMessage, ElMessageBox } from "element-plus";
 import useUserStore from "@/store/modules/user";
 import { onActivated } from "vue";
+import TitleInfo from "@/components/TitleInfo/index.vue";
 
 const route = useRoute();
 const { proxy } = getCurrentInstance();

src/components/process/SendSubscribe.vue

@@ -1,27 +1,15 @@
 <template>
   <div style="width: 100%; padding: 0px 15px">
-    <el-form
-      :model="formData.data"
-      :rules="rules"
-      ref="formDom"
-      label-position="top"
-      :disabled="judgeStatus()"
-    >
-      <div class="_t">申购信息</div>
+    <el-form :model="formData.data" :rules="rules" ref="formDom" label-position="top" :disabled="judgeStatus()">
+      <!-- <div class="_t">申购信息</div> -->
+      <div style="margin-left:-15px;margin-bottom:15px">
+        <TitleInfo :content="'申购信息'"></TitleInfo>
+      </div>
       <el-row :gutter="10">
         <el-col :span="6">
           <el-form-item label="归属公司" prop="corporationId">
-            <el-select
-              v-model="formData.data.corporationId"
-              placeholder="请选择"
-              filterable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in companyData"
-                :label="item.name"
-                :value="item.id"
-              >
+            <el-select v-model="formData.data.corporationId" placeholder="请选择" filterable style="width: 100%">
+              <el-option v-for="item in companyData" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -30,116 +18,67 @@
       <el-row :gutter="10">
         <el-col :span="6">
           <el-form-item label="申购部门" prop="deptName">
-            <el-input
-              v-model="formData.data.deptName"
-              placeholder="请输入"
-              disabled
-            >
+            <el-input v-model="formData.data.deptName" placeholder="请输入" disabled>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="申购人" prop="subcribeName">
-            <el-input
-              v-model="formData.data.subcribeName"
-              placeholder="请输入"
-              disabled
-            >
+            <el-input v-model="formData.data.subcribeName" placeholder="请输入" disabled>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="申购时间" prop="subcribeTime">
-            <el-date-picker
-              v-model="formData.data.subcribeTime"
-              type="datetime"
-              placeholder="请选择"
-              disabled
-            />
+            <el-date-picker v-model="formData.data.subcribeTime" type="datetime" placeholder="请选择" disabled />
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item label="申购说明" prop="subcribeContent">
-        <el-input
-          v-model="formData.data.subcribeContent"
-          placeholder="请输入"
-          type="textarea"
-        >
+        <el-input v-model="formData.data.subcribeContent" placeholder="请输入" type="textarea">
         </el-input>
       </el-form-item>
-      <div class="_t">申购明细</div>
+      <!-- <div class="_t">申购明细</div> -->
+      <div style="width:100%">
+        <div style="width:calc(100% + 80px);margin-left:-45px;background:#F0F2F5;height:15px"></div>
+        <div :style="{marginTop:true?'15px':''}" style="margin-left:-15px;margin-bottom:15px">
+          <TitleInfo :content="'申购明细'"></TitleInfo>
+        </div>
+      </div>
       <el-form-item>
-        <el-button
-          type="primary"
-          @click="openProduct = true"
-          style="margin: 10px 0"
-        >
+        <el-button type="primary" @click="openProduct = true" style="margin: 10px 0">
           添加货品
         </el-button>
         <el-table :data="formData.data.subscribeDetailList">
-          <el-table-column
-            prop="goodType"
-            label="货品类型"
-            :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')"
-          />
+          <el-table-column prop="goodType" label="货品类型" :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')" />
           <el-table-column prop="code" label="货品编码" />
           <el-table-column prop="name" label="货品名称" min-width="150" />
           <el-table-column prop="spec" label="规格型号" />
-          <el-table-column
-            prop="unit"
-            label="单位"
-            :formatter="(row) => dictValueLabel(row.unit, productUnit)"
-          />
+          <el-table-column prop="unit" label="单位" :formatter="(row) => dictValueLabel(row.unit, productUnit)" />
           <el-table-column prop="count" label="申购数量" min-width="150">
             <template #default="{ row, $index }">
-              <el-form-item
-                :prop="'subscribeDetailList.' + $index + '.count'"
-                :rules="rules.count"
-                :inline-message="true"
-              >
-                <el-input-number
-                  onmousewheel="return false;"
-                  v-model="row.count"
-                  :precision="4"
-                  :controls="false"
-                  :min="1"
-                />
+              <el-form-item :prop="'subscribeDetailList.' + $index + '.count'" :rules="rules.count" :inline-message="true">
+                <el-input-number onmousewheel="return false;" v-model="row.count" :precision="4" :controls="false" :min="1" />
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="remark" label="备注" min-width="150">
             <template #default="{ row, $index }">
-              <el-form-item
-                :prop="'subscribeDetailList.' + $index + '.remark'"
-                :rules="rules.remark"
-                :inline-message="true"
-              >
+              <el-form-item :prop="'subscribeDetailList.' + $index + '.remark'" :rules="rules.remark" :inline-message="true">
                 <el-input v-model="row.remark" placeholder="请输入" />
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="zip" label="操作" width="100">
             <template #default="{ $index }">
-              <el-button type="primary" link @click="handleRemove($index)"
-                >删除</el-button
-              >
+              <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-form-item>
     </el-form>
-    <el-dialog
-      v-if="openProduct"
-      v-model="openProduct"
-      title="选择货品"
-      width="70%"
-      append-to-body
-    >
-      <SelectGoods
-        :selectList="acquireSelectList()"
-        @cancel="openProduct = false"
-        @pushGoods="pushGoods"
-      ></SelectGoods>
+    <el-dialog v-if="openProduct" v-model="openProduct" title="选择货品" width="70%" append-to-body>
+      <SelectGoods :selectList="acquireSelectList()" @cancel="openProduct = false" @pushGoods="pushGoods"></SelectGoods>
     </el-dialog>
   </div>
 </template>
@@ -148,6 +87,8 @@
 import SelectGoods from "@/components/product/SelectGoods";
 import { ElMessage } from "element-plus";
 import useUserStore from "@/store/modules/user";
+import TitleInfo from "@/components/TitleInfo/index.vue";
+
 const route = useRoute();
 const { proxy } = getCurrentInstance();
 // 接收父组件的传值

src/views/customer/file/index.vue

@@ -13,11 +13,12 @@
           <el-collapse-item title="客户跟进" name="1">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户跟进
+                <!-- <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户跟进 -->
+                <TitleInfo :content="'客户跟进'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" @click="handleSearchOne(1)">
                 <span>超7天未跟进</span> <span>{{leftDataFour[7]}}</span>
               </div>
@@ -32,11 +33,12 @@
           <el-collapse-item title="客户来源" name="2">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户来源
+                <!-- <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户来源 -->
+                <TitleInfo :content="'客户来源'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerSource" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'source')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'source')}}</span>
@@ -46,11 +48,13 @@
           <el-collapse-item title="客户类型" name="3">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户类型
+                <!-- <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户类型 -->
+                <TitleInfo :content="'客户类型'"></TitleInfo>
+
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerStatus" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'status')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'status')}}</span>
@@ -60,11 +64,12 @@
           <el-collapse-item title="客户标签" name="4">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户标签
+                <!-- <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户标签 -->
+                <TitleInfo :content="'客户标签'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerTag" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'tag')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'tag')}}</span>
@@ -449,6 +454,7 @@ import byForm from "@/components/byForm/index";
 import { computed, ref } from "vue";
 import useUserStore from "@/store/modules/user";
 import selectCity from "@/components/selectCity/index.vue";
+import TitleInfo from "@/components/TitleInfo/index.vue";
 
 const { proxy } = getCurrentInstance();
 const activeNames = ref(["1", "2", "3", "4"]);
@@ -1393,11 +1399,9 @@ const obtainStatisticalData = () => {
     .then((res) => {
       leftData.value.status = res;
     });
-  proxy
-    .post("/customer/sourceStatistics", { statisticsType: 4, type: null })
-    .then((res) => {
-      leftData.value.tag = res;
-    });
+  proxy.post("/customer/tagStatistics", { type: null }).then((res) => {
+    leftData.value.tag = res;
+  });
   proxy.post("/customer/followStatistics", { type: null }).then((res) => {
     leftDataFour.value = res;
   });

src/views/customer/highseas/index.vue

@@ -13,11 +13,12 @@
           <el-collapse-item title="客户跟进" name="1">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户跟进
+                <!-- <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户跟进 -->
+                <TitleInfo :content="'客户跟进'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" @click="handleSearchOne(1)">
                 <span>超7天未跟进</span> <span>{{leftDataFour[7]}}</span>
               </div>
@@ -32,11 +33,13 @@
           <el-collapse-item title="客户来源" name="2">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户来源
+                <!-- <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户来源 -->
+                <TitleInfo :content="'客户来源'"></TitleInfo>
+
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerSource" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'source')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'source')}}</span>
@@ -46,11 +49,12 @@
           <el-collapse-item title="客户类型" name="3">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户类型
+                <!-- <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户类型 -->
+                <TitleInfo :content="'客户类型'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerStatus" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'status')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'status')}}</span>
@@ -60,11 +64,12 @@
           <el-collapse-item title="客户标签" name="4">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户标签
+                <!-- <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户标签 -->
+                <TitleInfo :content="'客户标签'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerTag" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'tag')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'tag')}}</span>
@@ -436,6 +441,7 @@ import byForm from "@/components/byForm/index";
 import { computed, ref } from "vue";
 import useUserStore from "@/store/modules/user";
 import selectCity from "@/components/selectCity/index.vue";
+import TitleInfo from "@/components/TitleInfo/index.vue";
 
 const { proxy } = getCurrentInstance();
 const activeNames = ref(["1", "2", "3", "4"]);
@@ -1294,11 +1300,9 @@ const obtainStatisticalData = () => {
     .then((res) => {
       leftData.value.status = res;
     });
-  proxy
-    .post("/customer/sourceStatistics", { statisticsType: 4, type: "0" })
-    .then((res) => {
-      leftData.value.tag = res;
-    });
+  proxy.post("/customer/tagStatistics", { type: "0" }).then((res) => {
+    leftData.value.tag = res;
+  });
   proxy.post("/customer/followStatistics", { type: "0" }).then((res) => {
     leftDataFour.value = res;
   });

src/views/customer/privatesea/index.vue

@@ -13,11 +13,12 @@
           <el-collapse-item title="客户跟进" name="1">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户跟进
+                <!-- <img src="@/assets/images/custom-1.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户跟进 -->
+                <TitleInfo :content="'客户跟进'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" @click="handleSearchOne(1)">
                 <span>超7天未跟进</span> <span>{{leftDataFour[7]}}</span>
               </div>
@@ -32,11 +33,12 @@
           <el-collapse-item title="客户来源" name="2">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户来源
+                <!-- <img src="@/assets/images/custom-2.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户来源 -->
+                <TitleInfo :content="'客户来源'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerSource" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'source')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'source')}}</span>
@@ -46,11 +48,12 @@
           <el-collapse-item title="客户类型" name="3">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户类型
+                <!-- <img src="@/assets/images/custom-4.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户类型 -->
+                <TitleInfo :content="'客户类型'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerStatus" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'status')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'status')}}</span>
@@ -60,11 +63,12 @@
           <el-collapse-item title="客户标签" name="4">
             <template #title>
               <div>
-                <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
-                客户标签
+                <!-- <img src="@/assets/images/custom-3.png" alt="" style="object-fit: contain;width: 20px;height: 20px;vertical-align: middle;" />
+                客户标签 -->
+                <TitleInfo :content="'客户标签'"></TitleInfo>
               </div>
             </template>
-            <div style="padding-left:25px;padding-right:10px">
+            <div style="padding:0 10px">
               <div style="display:flex;justify-content:space-between;cursor:pointer" v-for="(item,index) in customerTag" :key="item.value"
                    :style="{marginTop:index!=0?'15px':'0px'}" @click="handleSearch(item.value,'tag')">
                 <span>{{item.label}}</span> <span>{{showLeftData(item.value,'tag')}}</span>
@@ -436,6 +440,7 @@ import byForm from "@/components/byForm/index";
 import { computed, ref } from "vue";
 import useUserStore from "@/store/modules/user";
 import selectCity from "@/components/selectCity/index.vue";
+import TitleInfo from "@/components/TitleInfo/index.vue";
 
 const { proxy } = getCurrentInstance();
 const activeNames = ref(["1", "2", "3", "4"]);
@@ -1296,11 +1301,9 @@ const obtainStatisticalData = () => {
     .then((res) => {
       leftData.value.status = res;
     });
-  proxy
-    .post("/customer/sourceStatistics", { statisticsType: 4, type: "1" })
-    .then((res) => {
-      leftData.value.tag = res;
-    });
+  proxy.post("/customer/tagStatistics", { type: "1" }).then((res) => {
+    leftData.value.tag = res;
+  });
   proxy.post("/customer/followStatistics", { type: "1" }).then((res) => {
     leftDataFour.value = res;
   });