1

src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -1,39 +1,27 @@
 <template>
   <div class="tenant">
-    <byTable
-      :hideTable="true"
-      :hidePagination="true"
-      :source="sourceList.data"
-      :pagination="sourceList.pagination"
-      :config="config"
-      :statConfig="statConfig"
-      :loading="loading"
-      :selectConfig="selectConfig"
-      highlight-current-row
-      :onMoreSearch="true"
-      @moreSearch="clickMoreSearch"
-      :action-list="[
+    <byTable :hideTable="true" :hidePagination="true" :source="sourceList.data" :pagination="sourceList.pagination" :config="config"
+             :statConfig="statConfig" :loading="loading" :selectConfig="selectConfig" highlight-current-row :onMoreSearch="true"
+             @moreSearch="clickMoreSearch" :action-list="[
         {
           text: '默认汇率',
           action: () => openModal(),
         },
-      ]"
-      @get-list="getList"
-    >
+      ]" @get-list="getList">
     </byTable>
-    <div
-      style="padding: 0 20px 20px 20px; background-color: white"
-      v-if="rateStatus"
-    >
+    <div style="padding: 0 20px 20px 20px; background-color: white" v-if="rateStatus">
       <el-table :data="sourceList.data">
         <el-table-column label="合同编号" prop="code" width="160" fixed />
-        <el-table-column
-          label="客户名称"
-          prop="customerName"
-          min-width="200"
-          fixed
-        />
+        <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
         <el-table-column label="业务员" prop="userName" width="140" fixed />
+        <el-table-column label="收入总计" prop="incomeAmount" width="140" fixed />
+        <el-table-column label="支出总计" prop="expenditureAmount" width="140" fixed />
+        <el-table-column label="毛利率" width="140" fixed>
+          <template #default="{ row }">
+            <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="毛利" prop="gross" width="140" fixed />
         <el-table-column label="合同金额" width="140">
           <template #default="{ row }">
             <div>{{ row.currency }} {{ row.amount }}</div>
@@ -52,11 +40,7 @@
             <div>13%</div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="应退税金额"
-          prop="refundableAmount"
-          width="140"
-        />
+        <el-table-column label="应退税金额" prop="refundableAmount" width="140" />
         <el-table-column label="包材金额" width="140">
           <template #default="{ row }">
             <div>{{ row.peritectoidAmount }}</div>
@@ -104,63 +88,27 @@
             <div>{{ row.other }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="收入总计" prop="incomeAmount" width="140" />
-        <el-table-column
-          label="支出总计"
-          prop="expenditureAmount"
-          width="140"
-        />
-        <el-table-column label="毛利率" width="140">
-          <template #default="{ row }">
-            <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="毛利" prop="gross" width="140" />
+
         <el-table-column label="操作" align="center" width="160" fixed="right">
           <template #default="{ row }">
             <div>
-              <el-button type="primary" @click="changeExchangeRate(row)" link
-                >汇率</el-button
-              >
-              <el-button type="primary" @click="changeBudget(row)" link
-                >预算</el-button
-              >
+              <el-button type="primary" @click="changeExchangeRate(row)" link>汇率</el-button>
+              <el-button type="primary" @click="changeBudget(row)" link>预算</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
       <el-row style="padding: 20px" justify="end" type="flex">
-        <el-pagination
-          background
-          layout="total, sizes, prev, pager, next, jumper"
-          :current-page="sourceList.pagination.pageNum"
-          :page-size="sourceList.pagination.pageSize"
-          :total="sourceList.pagination.total"
-          @size-change="handleSizeChange"
-          @current-change="handlePageChange"
-        />
+        <el-pagination background layout="total, sizes, prev, pager, next, jumper" :current-page="sourceList.pagination.pageNum"
+                       :page-size="sourceList.pagination.pageSize" :total="sourceList.pagination.total" @size-change="handleSizeChange"
+                       @current-change="handlePageChange" />
       </el-row>
     </div>
 
-    <el-dialog
-      title="默认汇率"
-      v-if="dialogVisible"
-      v-model="dialogVisible"
-      width="600"
-    >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="submit"
-      >
+    <el-dialog title="默认汇率" v-if="dialogVisible" v-model="dialogVisible" width="600">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #currencyList>
-          <el-table
-            :data="formData.data.list"
-            style="width: 100%"
-            v-loading="loadingDialog"
-          >
+          <el-table :data="formData.data.list" style="width: 100%" v-loading="loadingDialog">
             <el-table-column label="币种">
               <template #default="{ row }">
                 <div>{{ dictValueLabel(row.type, accountCurrency) }}</div>
@@ -168,20 +116,9 @@
             </el-table-column>
             <el-table-column label="兑 CHY 汇率">
               <template #default="{ row, $index }">
-                <el-form-item
-                  :prop="'list.' + $index + '.rate'"
-                  :rules="rules.rate"
-                  :inline-message="true"
-                >
-                  <el-input-number
-                    onmousewheel="return false;"
-                    v-model="row.rate"
-                    placeholder="请输入兑 CHY 汇率"
-                    style="width: 100%"
-                    :precision="6"
-                    :controls="false"
-                    :min="0"
-                  />
+                <el-form-item :prop="'list.' + $index + '.rate'" :rules="rules.rate" :inline-message="true">
+                  <el-input-number onmousewheel="return false;" v-model="row.rate" placeholder="请输入兑 CHY 汇率" style="width: 100%" :precision="6"
+                                   :controls="false" :min="0" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -190,31 +127,14 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog
-      title="调整汇率"
-      v-if="openChange"
-      v-model="openChange"
-      width="600"
-    >
-      <byForm
-        :formConfig="formChangeConfig"
-        :formOption="formOption"
-        v-model="formChangeData.data"
-        :rules="rules"
-        ref="change"
-      >
+    <el-dialog title="调整汇率" v-if="openChange" v-model="openChange" width="600">
+      <byForm :formConfig="formChangeConfig" :formOption="formOption" v-model="formChangeData.data" :rules="rules" ref="change">
         <template #currencyList>
-          <el-table
-            :data="formChangeData.data.list"
-            style="width: 100%"
-            v-loading="loadingDialog"
-          >
+          <el-table :data="formChangeData.data.list" style="width: 100%" v-loading="loadingDialog">
             <el-table-column label="币种">
               <template #default="{ row }">
                 <div>{{ dictValueLabel(row.type, accountCurrency) }}</div>
@@ -222,20 +142,9 @@
             </el-table-column>
             <el-table-column label="兑 CHY 汇率">
               <template #default="{ row, $index }">
-                <el-form-item
-                  :prop="'list.' + $index + '.rate'"
-                  :rules="rules.rate"
-                  :inline-message="true"
-                >
-                  <el-input-number
-                    onmousewheel="return false;"
-                    v-model="row.rate"
-                    placeholder="请输入兑 CHY 汇率"
-                    style="width: 100%"
-                    :precision="6"
-                    :controls="false"
-                    :min="0"
-                  />
+                <el-form-item :prop="'list.' + $index + '.rate'" :rules="rules.rate" :inline-message="true">
+                  <el-input-number onmousewheel="return false;" v-model="row.rate" placeholder="请输入兑 CHY 汇率" style="width: 100%" :precision="6"
+                                   :controls="false" :min="0" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -244,198 +153,73 @@
       </byForm>
       <template #footer>
         <el-button @click="openChange = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitChangeForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitChangeForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
     <el-dialog title="预算" v-if="openBudget" v-model="openBudget" width="400">
-      <byForm
-        :formConfig="formBudgetConfig"
-        :formOption="formOption"
-        v-model="formBudgetData.data"
-        ref="budget"
-      >
+      <byForm :formConfig="formBudgetConfig" :formOption="formOption" v-model="formBudgetData.data" ref="budget">
         <template #budgetMoney>
           <div style="width: 100%">
             <el-form-item label="拖车费" prop="trailerFee">
-              <el-input
-                v-model="formBudgetData.data.trailerFee"
-                placeholder="请输入拖车费"
-                class="input-with-select"
-              >
+              <el-input v-model="formBudgetData.data.trailerFee" placeholder="请输入拖车费" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.trailerFeeCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.trailerFeeCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="报关费"
-              prop="customsFee"
-              style="margin-top: 20px"
-            >
-              <el-input
-                v-model="formBudgetData.data.customsFee"
-                placeholder="请输入报关费"
-                class="input-with-select"
-              >
+            <el-form-item label="报关费" prop="customsFee" style="margin-top: 20px">
+              <el-input v-model="formBudgetData.data.customsFee" placeholder="请输入报关费" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.customsFeeCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.customsFeeCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="代理费"
-              prop="agencyFee"
-              style="margin-top: 20px"
-            >
-              <el-input
-                v-model="formBudgetData.data.agencyFee"
-                placeholder="请输入代理费"
-                class="input-with-select"
-              >
+            <el-form-item label="代理费" prop="agencyFee" style="margin-top: 20px">
+              <el-input v-model="formBudgetData.data.agencyFee" placeholder="请输入代理费" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.agencyFeeCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.agencyFeeCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="港杂费"
-              prop="portMixedFee"
-              style="margin-top: 20px"
-            >
-              <el-input
-                v-model="formBudgetData.data.portMixedFee"
-                placeholder="请输入港杂费"
-                class="input-with-select"
-              >
+            <el-form-item label="港杂费" prop="portMixedFee" style="margin-top: 20px">
+              <el-input v-model="formBudgetData.data.portMixedFee" placeholder="请输入港杂费" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.portMixedFeeCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.portMixedFeeCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="验货红包"
-              prop="inspectionRedPack"
-              style="margin-top: 20px"
-            >
-              <el-input
-                v-model="formBudgetData.data.inspectionRedPack"
-                placeholder="请输入验货红包"
-                class="input-with-select"
-              >
+            <el-form-item label="验货红包" prop="inspectionRedPack" style="margin-top: 20px">
+              <el-input v-model="formBudgetData.data.inspectionRedPack" placeholder="请输入验货红包" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.inspectionRedPackCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.inspectionRedPackCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="佣金"
-              prop="commission"
-              style="margin-top: 20px"
-            >
-              <el-input
-                v-model="formBudgetData.data.commission"
-                placeholder="请输入佣金"
-                class="input-with-select"
-              >
+            <el-form-item label="佣金" prop="commission" style="margin-top: 20px">
+              <el-input v-model="formBudgetData.data.commission" placeholder="请输入佣金" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.commissionCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.commissionCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
             </el-form-item>
             <el-form-item label="其他" prop="other" style="margin-top: 20px">
-              <el-input
-                v-model="formBudgetData.data.other"
-                placeholder="请输入其他"
-                class="input-with-select"
-              >
+              <el-input v-model="formBudgetData.data.other" placeholder="请输入其他" class="input-with-select">
                 <template #prepend>
-                  <el-select
-                    v-model="formBudgetData.data.otherCurrency"
-                    placeholder="请选择货币"
-                    style="width: 115px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="(item, index) in accountCurrency"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formBudgetData.data.otherCurrency" placeholder="请选择货币" style="width: 115px" disabled>
+                    <el-option v-for="(item, index) in accountCurrency" :key="index" :label="item.label" :value="item.value" />
                   </el-select>
                 </template>
               </el-input>
@@ -445,29 +229,16 @@
       </byForm>
       <template #footer>
         <el-button @click="openBudget = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitBudgetForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitBudgetForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog
-      :title="'高级检索'"
-      v-model="moreSearchDialog"
-      width="500px"
-      destroy-on-close
-    >
-      <byForm
-        :formConfig="formSearchConfig"
-        :formOption="formOption"
-        v-model="sourceList.pagination"
-      >
+    <el-dialog :title="'高级检索'" v-model="moreSearchDialog" width="500px" destroy-on-close>
+      <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
       </byForm>
       <template #footer>
         <el-button @click="moreSearchReset" size="large">重置</el-button>
-        <el-button @click="moreSearchQuery" type="primary" size="large"
-          >搜索</el-button
-        >
+        <el-button @click="moreSearchQuery" type="primary" size="large">搜索</el-button>
       </template>
     </el-dialog>
   </div>

src/views/EHSD/procurement/profitSettlementEHSD/index.vue

@@ -1,28 +1,23 @@
 <template>
   <div class="tenant">
-    <byTable
-      :hideTable="true"
-      :hidePagination="true"
-      :source="sourceList.data"
-      :pagination="sourceList.pagination"
-      :config="config"
-      :loading="loading"
-      highlight-current-row
-      :onMoreSearch="true"
-      @moreSearch="clickMoreSearch"
-      @get-list="getList"
-    >
+    <byTable :hideTable="true" :hidePagination="true" :source="sourceList.data" :pagination="sourceList.pagination" :config="config"
+             highlight-current-row :onMoreSearch="true" @moreSearch="clickMoreSearch" @get-list="getList">
     </byTable>
     <div style="padding: 0 20px 20px 20px; background-color: white">
       <el-table v-loading="loading" :data="sourceList.data">
         <el-table-column label="合同编号" prop="code" width="160" fixed />
-        <el-table-column
-          label="客户名称"
-          prop="customerName"
-          min-width="200"
-          fixed
-        />
+        <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
         <el-table-column label="业务员" prop="userName" width="140" fixed />
+        <el-table-column label="统计" fixed>
+          <el-table-column label="收入合计" prop="incomeAmount" width="140" />
+          <el-table-column label="支出合计" prop="expenditureAmount" width="140" />
+          <el-table-column label="毛利" prop="gross" width="140" />
+          <el-table-column label="毛利率" width="140">
+            <template #default="{ row }">
+              <div>{{ row.grossRate }}%</div>
+            </template>
+          </el-table-column>
+        </el-table-column>
         <el-table-column label="合同金额" width="140">
           <template #default="{ row }">
             <div>{{ row.amount }}</div>
@@ -30,163 +25,80 @@
         </el-table-column>
         <el-table-column label="收入">
           <el-table-column label="到账金额" prop="sumClaimMoney" width="140" />
-          <el-table-column
-            label="退税金额"
-            prop="refundableAmount"
-            width="140"
-          />
-          <el-table-column
-            label="其他收入"
-            prop="otherIncomeAmount"
-            width="140"
-          />
+          <el-table-column label="退税金额" prop="refundableAmount" width="140" />
+          <el-table-column label="其他收入" prop="otherIncomeAmount" width="140" />
         </el-table-column>
-        <el-table-column
-          label="采购合同金额"
-          prop="sumPurchaseContractMoney"
-          width="140"
-        />
+        <el-table-column label="采购合同金额" prop="sumPurchaseContractMoney" width="140" />
         <el-table-column label="支出">
           <el-table-column label="已付货款" prop="accountPaid" width="140" />
           <el-table-column label="代理费" prop="agencyFee" width="140" />
           <el-table-column label="拖车费" prop="trailerFee" width="140" />
           <el-table-column label="报关费" prop="customsFee" width="140" />
           <el-table-column label="港杂费" prop="portMixedFee" width="140" />
-          <el-table-column
-            label="验货红包"
-            prop="inspectionRedPack"
-            width="140"
-          />
+          <el-table-column label="验货红包" prop="inspectionRedPack" width="140" />
           <el-table-column label="佣金" prop="commission" width="140" />
           <el-table-column label="检测费" prop="checkout" width="140" />
           <el-table-column label="验货费" prop="inspectionCharge" width="140" />
           <el-table-column label="运费" prop="freight" width="140" />
-          <el-table-column
-            label="产地证费"
-            prop="certificateOfOrigin"
-            width="140"
-          />
+          <el-table-column label="产地证费" prop="certificateOfOrigin" width="140" />
           <el-table-column label="其他" prop="other" width="140" />
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="200" />
-        <el-table-column label="统计">
-          <el-table-column label="收入合计" prop="incomeAmount" width="140" />
-          <el-table-column
-            label="支出合计"
-            prop="expenditureAmount"
-            width="140"
-          />
-          <el-table-column label="毛利" prop="gross" width="140" />
-          <el-table-column label="毛利率" width="140">
-            <template #default="{ row }">
-              <div>{{ row.grossRate }}%</div>
-            </template>
-          </el-table-column>
-        </el-table-column>
+
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template #default="{ row }">
             <div>
-              <el-button type="primary" @click="changeAgencyFee(row)" link
-                >代理费</el-button
-              >
-              <el-button type="primary" @click="changeRemark(row)" link
-                >备注</el-button
-              >
+              <el-button type="primary" @click="changeAgencyFee(row)" link>代理费</el-button>
+              <el-button type="primary" @click="changeRemark(row)" link>备注</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
       <el-row style="padding: 20px" justify="end" type="flex">
-        <el-pagination
-          background
-          layout="total, sizes, prev, pager, next, jumper"
-          :current-page="sourceList.pagination.pageNum"
-          :page-size="sourceList.pagination.pageSize"
-          :total="sourceList.pagination.total"
-          @size-change="handleSizeChange"
-          @current-change="handlePageChange"
-        />
+        <el-pagination background layout="total, sizes, prev, pager, next, jumper" :current-page="sourceList.pagination.pageNum"
+                       :page-size="sourceList.pagination.pageSize" :total="sourceList.pagination.total" @size-change="handleSizeChange"
+                       @current-change="handlePageChange" />
       </el-row>
     </div>
 
-    <el-dialog
-      title="代理费"
-      v-if="openAgencyFee"
-      v-model="openAgencyFee"
-      width="400"
-    >
-      <byForm
-        :formConfig="formAgencyFeeConfig"
-        :formOption="formOption"
-        v-model="formAgencyFeeData.data"
-        ref="agencyFee"
-      >
+    <el-dialog title="代理费" v-if="openAgencyFee" v-model="openAgencyFee" width="400">
+      <byForm :formConfig="formAgencyFeeConfig" :formOption="formOption" v-model="formAgencyFeeData.data" ref="agencyFee">
         <template #agencyFee>
           <div style="width: 100%">
             <el-form-item label="代理费" prop="agencyFee">
-              <el-input-number
-                onmousewheel="return false;"
-                v-model="formAgencyFeeData.data.agencyFee"
-                :precision="2"
-                :controls="false"
-                :min="0"
-              />
+              <el-input-number onmousewheel="return false;" v-model="formAgencyFeeData.data.agencyFee" :precision="2" :controls="false" :min="0" />
             </el-form-item>
           </div>
         </template>
       </byForm>
       <template #footer>
         <el-button @click="openAgencyFee = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitAgencyFeeForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitAgencyFeeForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
     <el-dialog title="备注" v-if="openRemark" v-model="openRemark" width="400">
-      <byForm
-        :formConfig="formRemarkConfig"
-        :formOption="formOption"
-        v-model="formRemarkData.data"
-        ref="remark"
-      >
+      <byForm :formConfig="formRemarkConfig" :formOption="formOption" v-model="formRemarkData.data" ref="remark">
         <template #remark>
           <div style="width: 100%">
             <el-form-item label="备注" prop="remark">
-              <el-input
-                v-model="formRemarkData.data.remark"
-                :rows="4"
-                type="textarea"
-              />
+              <el-input v-model="formRemarkData.data.remark" :rows="4" type="textarea" />
             </el-form-item>
           </div>
         </template>
       </byForm>
       <template #footer>
         <el-button @click="openRemark = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitRemarkForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitRemarkForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog
-      :title="'高级检索'"
-      v-model="moreSearchDialog"
-      width="500px"
-      destroy-on-close
-    >
-      <byForm
-        :formConfig="formSearchConfig"
-        :formOption="formOption"
-        v-model="sourceList.pagination"
-      >
+    <el-dialog :title="'高级检索'" v-model="moreSearchDialog" width="500px" destroy-on-close>
+      <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
       </byForm>
       <template #footer>
         <el-button @click="moreSearchReset" size="large">重置</el-button>
-        <el-button @click="moreSearchQuery" type="primary" size="large"
-          >搜索</el-button
-        >
+        <el-button @click="moreSearchQuery" type="primary" size="large">搜索</el-button>
       </template>
     </el-dialog>
   </div>

src/views/process/processApproval/index.vue

@@ -8,10 +8,7 @@
         <div class="line"></div>
         <!-- 报价单 -->
         <template v-if="flowForm.flowKey == 'sale_quotation_flow'">
-          <PriceSheetEHSD
-            ref="makeDom"
-            :queryData="queryData.data"
-          ></PriceSheetEHSD>
+          <PriceSheetEHSD ref="makeDom" :queryData="queryData.data"></PriceSheetEHSD>
         </template>
 
         <!-- 样品单 -->
@@ -20,46 +17,27 @@
         </template>
         <!-- 样品单变更 -->
         <template v-else-if="flowForm.flowKey == 'sample_update_flow'">
-          <SampleChangeEHSD
-            ref="makeDom"
-            :queryData="queryData.data"
-          ></SampleChangeEHSD>
+          <SampleChangeEHSD ref="makeDom" :queryData="queryData.data"></SampleChangeEHSD>
         </template>
 
         <!-- 销售合同 -->
         <template v-else-if="flowForm.flowKey == 'contract_flow'">
-          <ContractEHSD
-            ref="makeDom"
-            :queryData="queryData.data"
-            @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          ></ContractEHSD>
+          <ContractEHSD ref="makeDom" :queryData="queryData.data" @auxiliaryChange="(e) => getAuxiliaryData(e)"></ContractEHSD>
         </template>
 
         <!-- 销售合同变更 -->
         <template v-else-if="flowForm.flowKey == 'contract_update_flow'">
-          <ContractChangeEHSD
-            ref="makeDom"
-            :queryData="queryData.data"
-            @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          ></ContractChangeEHSD>
+          <ContractChangeEHSD ref="makeDom" :queryData="queryData.data" @auxiliaryChange="(e) => getAuxiliaryData(e)"></ContractChangeEHSD>
         </template>
 
         <!-- 申购 -->
-        <SendSubscribe
-          ref="makeDom"
-          @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          v-else-if="flowForm.flowKey == 'subscribe_flow'"
-          :queryData="queryData.data"
-        ></SendSubscribe>
+        <SendSubscribe ref="makeDom" @auxiliaryChange="(e) => getAuxiliaryData(e)" v-else-if="flowForm.flowKey == 'subscribe_flow'"
+                       :queryData="queryData.data"></SendSubscribe>
 
         <!-- 样品单采购、交接单采购 -->
         <template v-else-if="flowForm.flowKey == 'ehsd_purchase_flow'">
-          <PurchaseEHSD
-            ref="makeDom"
-            :queryData="queryData.data"
-            v-if="flowForm.submitType === '10'"
-            @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          ></PurchaseEHSD>
+          <PurchaseEHSD ref="makeDom" :queryData="queryData.data" v-if="flowForm.submitType === '10'" @auxiliaryChange="(e) => getAuxiliaryData(e)">
+          </PurchaseEHSD>
           <!-- <SendPurchase
             ref="makeDom"
             :queryData="queryData.data"
@@ -69,43 +47,23 @@
         </template>
 
         <template v-else-if="flowForm.flowKey == 'purchase_flow'">
-          <SendPurchase
-            ref="makeDom"
-            :queryData="queryData.data"
-            @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          ></SendPurchase>
+          <SendPurchase ref="makeDom" :queryData="queryData.data" @auxiliaryChange="(e) => getAuxiliaryData(e)"></SendPurchase>
         </template>
 
-        <PurchaseChangeEHSD
-          ref="makeDom"
-          :queryData="queryData.data"
-          v-else-if="flowForm.flowKey == 'ehsd_purchase_update_flow'"
-          @auxiliaryChange="(e) => getAuxiliaryData(e)"
-        ></PurchaseChangeEHSD>
+        <PurchaseChangeEHSD ref="makeDom" :queryData="queryData.data" v-else-if="flowForm.flowKey == 'ehsd_purchase_update_flow'"
+                            @auxiliaryChange="(e) => getAuxiliaryData(e)"></PurchaseChangeEHSD>
 
         <!-- 采购付款 -->
-        <PurchasePayment
-          ref="makeDom"
-          @auxiliaryChange="(e) => getAuxiliaryData(e)"
-          v-else-if="flowForm.flowKey == 'pay_flow'"
-          :queryData="queryData.data"
-        ></PurchasePayment>
+        <PurchasePayment ref="makeDom" @auxiliaryChange="(e) => getAuxiliaryData(e)" v-else-if="flowForm.flowKey == 'pay_flow'"
+                         :queryData="queryData.data"></PurchasePayment>
 
         <!-- 请款 -->
-        <SendFunds
-          ref="makeDom"
-          v-else-if="flowForm.flowKey == 'account_request_funds_flow'"
-          :queryData="queryData.data"
-        ></SendFunds>
+        <SendFunds ref="makeDom" v-else-if="flowForm.flowKey == 'account_request_funds_flow'" :queryData="queryData.data"></SendFunds>
 
         <!-- 取消到账认领 -->
-        <CancelClaim
-          ref="makeDom"
-          v-else-if="flowForm.flowKey == 'claim_del_flow'"
-          :queryData="queryData.data"
-        ></CancelClaim>
+        <CancelClaim ref="makeDom" v-else-if="flowForm.flowKey == 'claim_del_flow'" :queryData="queryData.data"></CancelClaim>
       </div>
-      <div class="bottom" v-if="isShowSubmitDom">
+      <!-- <div class="bottom" v-if="isShowSubmitDom">
         <div class="commons-title title">处理意见</div>
         <el-form :model="flowForm" :rules="flowRules" ref="flowFormDom">
           <el-form-item prop="remark" label-width="0px" label="">
@@ -148,16 +106,38 @@
             >
           </el-form-item>
         </el-form>
-      </div>
+      </div> -->
     </div>
     <div class="right-card">
       <el-tabs v-model="activeName" class="demo-tabs">
-        <el-tab-pane label="审批记录" name="first">
+        <el-tab-pane label="处理意见" name="first" v-if="isShowSubmitDom">
+          <div style="overflow: auto; height: calc(100vh - 240px)">
+            <el-form :model="flowForm" :rules="flowRules" ref="flowFormDom">
+              <el-form-item prop="remark" label-width="0px" label="">
+                <el-input type="textarea" placeholder="请输入" :rows="10" v-model="flowForm.remark">
+                </el-input>
+              </el-form-item>
+              <el-form-item prop="remark" label-width="80px" label="附件上传">
+                <div style="width:100%">
+                  <el-upload v-model:fileList="flowForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
+                             multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+                    <el-button>选择</el-button>
+                  </el-upload>
+                </div>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" v-if="approvalRecordData.buttonInfoList.length == 0" @click="handleSubmit"
+                           :loading="btnLoading">提交</el-button>
+                <el-button type="primary" v-else v-for="i in approvalRecordData.buttonInfoList" :key="i.type" :loading="btnLoading"
+                           @click="handleSubmit(i.type)">{{ i.name }}</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+
+        </el-tab-pane>
+        <el-tab-pane label="审批记录" name="second">
           <ul class="flow-chart">
-            <li
-              v-for="item in recordList"
-              :key="item.id"
-              :class="
+            <li v-for="item in recordList" :key="item.id" :class="
                 !route.query.id
                   ? ''
                   : item.status == 2
@@ -167,8 +147,7 @@
                   : item.status == 3 && route.query.id
                   ? 'flow-grey'
                   : ''
-              "
-            >
+              ">
               <div class="left-icon">
                 <i class="iconfont icon-iconm_daick"></i>
                 <i class="iconfont icon-icomx_quertj1 right-btm-status"></i>
@@ -177,20 +156,12 @@
                 <div class="name">{{ item.nodeName }}</div>
                 <div class="remark">
                   <div class="label">
-                    <span v-if="item.status != 3">办理人：</span
-                    >{{ item.processedUser
+                    <span v-if="item.status != 3">办理人：</span>{{ item.processedUser
                     }}<span class="time">{{ item.processedDate }}</span>
                   </div>
                   {{ item.remark }}
-                  <div
-                    v-for="j in fileObj[item.flowExampleDetailId]"
-                    v-if="fileObj[item.flowExampleDetailId]"
-                  >
-                    <a
-                      @click="proxy.download(j.fileUrl, j.fileName)"
-                      style="color: #409eff; line-height: 30px"
-                      >{{ j.fileName }}</a
-                    >
+                  <div v-for="j in fileObj[item.flowExampleDetailId]" v-if="fileObj[item.flowExampleDetailId]">
+                    <a @click="proxy.download(j.fileUrl, j.fileName)" style="color: #409eff; line-height: 30px">{{ j.fileName }}</a>
                   </div>
                 </div>
               </div>
@@ -198,11 +169,7 @@
             </li>
           </ul>
         </el-tab-pane>
-        <el-tab-pane
-          label="决策辅助"
-          name="second"
-          v-if="auxiliaryData.length > 0"
-        >
+        <el-tab-pane label="决策辅助" name="three" v-if="auxiliaryData.length > 0">
           <div style="overflow: auto; height: calc(100vh - 200px)">
             <auxiliary :data="auxiliaryData"></auxiliary>
           </div>
@@ -210,28 +177,12 @@
       </el-tabs>
     </div>
 
-    <el-dialog
-      title="下一处理人"
-      width="400"
-      v-model="dialogVisible"
-      v-if="dialogVisible"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-    >
+    <el-dialog title="下一处理人" width="400" v-model="dialogVisible" v-if="dialogVisible" :show-close="false" :close-on-click-modal="false"
+               :close-on-press-escape="false">
       <el-form :model="flowForm">
         <el-form-item prop="remark" label="处理人">
-          <el-select
-            v-model="flowForm.handleUserId"
-            placeholder="请选择"
-            filterable
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in nextHandleUser"
-              :label="item.nickName"
-              :value="item.userId"
-            >
+          <el-select v-model="flowForm.handleUserId" placeholder="请选择" filterable style="width: 100%">
+            <el-option v-for="item in nextHandleUser" :label="item.nickName" :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -700,6 +651,8 @@ onMounted(async () => {
   if (route.query && route.query.flowKey) {
     //processType 10 为修改 20为查看 30回退发起
     if (route.query.processType == 20) {
+      activeName.value = "second";
+
       isShowSubmitDom.value = false;
     }
     if (
@@ -727,6 +680,7 @@ watch(
     if (props.query) {
       if (props.query.processType == 20) {
         isShowSubmitDom.value = false;
+        activeName.value = "second";
       }
       if (
         props.query.processType == 10 ||
@@ -764,7 +718,7 @@ const getFlowName = () => {
 };
 </script>
 <style>
-.el-upload-list {
+/* .el-upload-list {
   float: left;
   margin: 0 !important;
 }
@@ -774,7 +728,7 @@ const getFlowName = () => {
 }
 .el-upload--text {
   float: left;
-}
+} */
 </style>
 <style lang="scss" scoped>
 .processApproval {