Merge remote-tracking branch 'origin/dev_v2' into dev_v2

ruoyi-ui-vue2/src/views/quotation/quotation.vue

@@ -23,44 +23,44 @@
           </template>
         </Column>
         <!--版本号-->
-        <Column :label="$t('common.version')" prop="version"/>
+        <Column :label="$t('common.version')" prop="version" width="80px"/>
+        <!--报价状态-->
+        <Column :label="$t('quotation.quotationStatus')" prop="quotationStatus" :min-width="250" :searchDict="dict.type.quotation_status" :showSearch="true" :selectMore="true" searchType="select" width="170px">
+          <template #default="{ row }">
+            <ColorDictTag :bgc="statusColorMap[row.quotationStatus].bgc" :label="convertStatus(row.quotationStatus)" :label-color="statusColorMap[row.quotationStatus].color"
+                          @click.native="main.showAuditHistory(row.id, [AUDIT_FLOW.QUOTATION, AUDIT_FLOW.BARGAIN].join(','))"/>
+          </template>
+        </Column>
         <!--项目名称-->
         <Column :label="$t('project.projectName')" :showSearch="true" prop="projectName"/>
-        <!--项目类型-->
-        <Column :label="$t('project.type')" prop="type" :showSearch="true" searchType="select" :searchDict="dict.type.project_type" width="200px" :selectMore="true"/>
-        <!--项目细分市场-->
-        <Column :label="$t('project.projectSegments')" prop="segmentedMarket" :showSearch="true" searchType="select" :searchDict="dict.type.project_market" width="200px" :selectMore="true"/>
+<!--        &lt;!&ndash;项目类型&ndash;&gt;-->
+<!--        <Column :label="$t('project.type')" prop="type" :showSearch="true" searchType="select" :searchDict="dict.type.project_type" width="200px" :selectMore="true"/>-->
+<!--        &lt;!&ndash;项目细分市场&ndash;&gt;-->
+<!--        <Column :label="$t('project.projectSegments')" prop="segmentedMarket" :showSearch="true" searchType="select" :searchDict="dict.type.project_market" width="200px" :selectMore="true"/>-->
         <!--国家-->
-        <Column :label="$t('project.countryId')" prop="countryId" :showSearch="true" searchType="select" :searchDict="countryList" width="200px" :selectMore="true"/>
+        <Column :label="$t('project.countryId')" prop="countryId" :showSearch="true" width="150px" searchType="select" :searchDict="countryList" :selectMore="true"/>
         <!--城市-->
-        <Column :label="$t('project.city')" prop="city" :showSearch="true" width="200px" :selectMore="true"/>
-        <!--币种-->
-        <Column :label="$t('project.currency')" prop="currencyId" :showSearch="true" searchType="select" :searchDict="currencyList" width="200px" :selectMore="true"/>
+        <Column :label="$t('project.city')" prop="city" :showSearch="true" width="150px" :selectMore="true"/>
         <!--梯形-->
         <Column :label="$t('quotation.suitModel')" prop="elevatorModel" :showSearch="true"/>
-        <!--报价者-->
-        <Column :label="$t('quotation.quoter')" prop="nickName" :showSearch="true"/>
+        <!--币种-->
+        <Column :label="$t('project.currency')" prop="currencyId" :showSearch="true" searchType="select" :searchDict="dict.type.currency_type" width="150px" :selectMore="true"/>
         <!--最终价格-->
-        <Column :label="$t('quotation.finalPrice')" prop="finalPrice" align="right">
+        <Column :label="$t('quotation.finalPrice')" prop="finalPrice" align="right" width="120px">
           <template #default="{ row }">
             {{ numFormat(row.finalPrice) }}
           </template>
         </Column>
         <!--附加费用-->
-        <Column :label="$t('quotation.additionalCost')" prop="additionalFees" align="right">
+        <Column :label="$t('quotation.additionalCost')" prop="additionalFees" align="right" width="120px">
           <template #default="{ row }">
             {{ numFormat(row.additionalFees) }}
           </template>
         </Column>
+        <!--报价者-->
+        <Column :label="$t('quotation.quoter')" prop="nickName" :showSearch="true"/>
         <!--提交时间-->
         <Column :label="$t('quotation.submitTime')" prop="submitTime" align="center" :min-width="300" :showSearch="true" searchType="dateRange"/>
-        <!--报价状态-->
-        <Column :label="$t('quotation.quotationStatus')" prop="quotationStatus" :min-width="250" :searchDict="dict.type.quotation_status" :showSearch="true" :selectMore="true" searchType="select">
-          <template #default="{ row }">
-            <ColorDictTag :bgc="statusColorMap[row.quotationStatus].bgc" :label="convertStatus(row.quotationStatus)" :label-color="statusColorMap[row.quotationStatus].color"
-                          @click.native="main.showAuditHistory(row.id, [AUDIT_FLOW.QUOTATION, AUDIT_FLOW.BARGAIN].join(','))"/>
-          </template>
-        </Column>
         <!--操作-->
         <Column :label="$t('common.operate')" :min-width="200" :showSearch="true" fixed="right" searchType="operate">
           <template #default="{ row }">