feat:前端列表隐藏镜片厂和品牌商列，价格合并，不显示明细

developer-front/src/views/order/factory-order.vue

@@ -24,25 +24,14 @@
 
       <el-table v-loading="loading" :data="orderList">
         <el-table-column label="订单编号" align="center" prop="orderNo" min-width="180" show-overflow-tooltip />
-        <el-table-column label="品牌方" align="center" prop="brandTenantName" min-width="100" />
         <el-table-column label="通用镜片" align="center" min-width="120">
           <template slot-scope="scope">
             <span>{{ formatLens(scope.row) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="C价格" align="center" width="80">
+        <el-table-column label="总价" align="center" width="90">
           <template slot-scope="scope">
-            <span>{{ formatPriceAmount(formatPriceC(scope.row)) }}</span>
+            <span>{{ formatPriceAmount(formatDetailPriceTotal(scope.row, 'priceC')) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="物流费用" align="center" width="90">
-          <template slot-scope="scope">
-            <span>{{ formatPriceAmount(formatLogisticsFee(scope.row)) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="渐进多焦点价格" align="center" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ formatProgressiveMultifocalPrice(scope.row) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="订单状态" align="center" prop="orderStatus" width="100">
@@ -148,7 +137,6 @@
               <el-descriptions-item label="订单状态">
                 <dict-tag :options="dict.type.jy_order_status" :value="detail.orderStatus" />
               </el-descriptions-item>
-              <el-descriptions-item label="品牌方">{{ detail.brandTenantName || '-' }}</el-descriptions-item>
               <el-descriptions-item label="通用镜片">{{ formatLens(detail) }}</el-descriptions-item>
               <el-descriptions-item label="渐进多焦点">{{ detail.progressiveMultifocal === 1 ? '是' : '否' }}</el-descriptions-item>
               <el-descriptions-item label="附件" :span="2">
@@ -196,9 +184,6 @@
           </div>
           <div class="section-body">
             <el-descriptions :column="2" border size="small" class="detail-descriptions detail-descriptions--price">
-              <el-descriptions-item label="C价格">{{ formatPriceAmount(formatPriceC(detail)) }}</el-descriptions-item>
-              <el-descriptions-item label="物流费用">{{ formatPriceAmount(formatDetailLogisticsFee(detail)) }}</el-descriptions-item>
-              <el-descriptions-item label="渐进多焦点价格">{{ formatPriceAmount(formatProgressiveMultifocalPrice(detail)) }}</el-descriptions-item>
               <el-descriptions-item label="合计">
                 <span class="price-total-value">{{ formatPriceAmount(formatDetailPriceTotal(detail, 'priceC')) }}</span>
               </el-descriptions-item>

developer-front/src/views/order/lens-order.vue

@@ -46,47 +46,20 @@
       <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
         <el-table-column v-if="canManage" type="selection" width="55" align="center" />
         <el-table-column label="订单编号" align="center" prop="orderNo" min-width="180" show-overflow-tooltip />
-        <el-table-column label="镜片厂" align="center" min-width="100">
-          <template slot-scope="scope">
-            <el-tag
-              v-if="isPendingTagText(formatLensFactory(scope.row))"
-              type="danger"
-              size="small"
-              :disable-transitions="true"
-            >{{ formatLensFactory(scope.row) }}</el-tag>
-            <span v-else>{{ formatLensFactory(scope.row) }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="通用镜片" align="center" min-width="120">
           <template slot-scope="scope">
             <span>{{ formatLens(scope.row) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="B价格" align="center" width="80">
+        <el-table-column label="总价" align="center" width="90">
           <template slot-scope="scope">
             <el-tag
-              v-if="isPendingTagText(formatPriceB(scope.row))"
+              v-if="isPendingTagText(formatPriceAmount(formatDetailPriceTotal(scope.row, 'priceB')))"
               type="danger"
               size="small"
               :disable-transitions="true"
-            >{{ formatPriceB(scope.row) }}</el-tag>
+            >{{ formatPriceAmount(formatDetailPriceTotal(scope.row, 'priceB')) }}</el-tag>
-            <span v-else>{{ formatPriceB(scope.row) }}</span>
+            <span v-else>{{ formatPriceAmount(formatDetailPriceTotal(scope.row, 'priceB')) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="物流费用" align="center" width="90">
-          <template slot-scope="scope">
-            <span>{{ formatPriceAmount(formatLogisticsFee(scope.row)) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="渐进多焦点价格" align="center" min-width="100">
-          <template slot-scope="scope">
-            <el-tag
-              v-if="isPendingTagText(formatProgressiveMultifocalPrice(scope.row))"
-              type="danger"
-              size="small"
-              :disable-transitions="true"
-            >{{ formatProgressiveMultifocalPrice(scope.row) }}</el-tag>
-            <span v-else>{{ formatProgressiveMultifocalPrice(scope.row) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="订单状态" align="center" prop="orderStatus" width="100">
@@ -445,80 +418,6 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column align="center" min-width="100">
-                <template slot="header">
-                  <el-tooltip content="可录入范围：15 ~ 25 mm" placement="top">
-                    <span class="optometry-header-tip">瞳高(mm)</span>
-                  </el-tooltip>
-                </template>
-                <template slot-scope="scope">
-                  <div class="axis-input-wrap">
-                    <div class="axis-step-actions">
-                      <button type="button" class="axis-step-btn" @click="adjustPupilHeight(scope.row, -5)">-5</button>
-                      <button type="button" class="axis-step-btn" @click="adjustPupilHeight(scope.row, 5)">+5</button>
-                    </div>
-                    <el-input-number
-                      v-model="scope.row.pupilHeight"
-                      :precision="0"
-                      :step="1"
-                      :min="PUPIL_HEIGHT_MIN"
-                      :max="PUPIL_HEIGHT_MAX"
-                      controls-position="right"
-                      style="width: 100%"
-                    />
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" min-width="100">
-                <template slot="header">
-                  <el-tooltip content="可录入范围：0.02 ~ 2.00" placement="top">
-                    <span class="optometry-header-tip">远用VA(视力值)</span>
-                  </el-tooltip>
-                </template>
-                <template slot-scope="scope">
-                  <div class="axis-input-wrap">
-                    <div class="axis-step-actions">
-                      <button type="button" class="axis-step-btn axis-step-btn-wide" @click="adjustDistanceVa(scope.row, -0.1)">-0.1</button>
-                      <button type="button" class="axis-step-btn axis-step-btn-wide" @click="adjustDistanceVa(scope.row, 0.1)">+0.1</button>
-                    </div>
-                    <el-input-number
-                      v-model="scope.row.distanceVa"
-                      :precision="2"
-                      :step="0.01"
-                      :min="0.02"
-                      :max="2"
-                      controls-position="right"
-                      style="width: 100%"
-                    />
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" min-width="110">
-                <template slot="header">
-                  <el-tooltip content="可录入范围：0.50 ~ 3.00（正值，表示下加光）" placement="top">
-                    <span class="optometry-header-tip">近用ADD(屈光度)</span>
-                  </el-tooltip>
-                </template>
-                <template slot-scope="scope">
-                  <div class="axis-input-wrap">
-                    <div class="axis-step-actions">
-                      <button type="button" class="axis-step-btn axis-step-btn-wide" @click="adjustNearAdd(scope.row, -0.5)">-0.5</button>
-                      <button type="button" class="axis-step-btn axis-step-btn-wide" @click="adjustNearAdd(scope.row, 0.5)">+0.5</button>
-                    </div>
-                    <div class="near-add-input">
-                      <span class="near-add-prefix">+</span>
-                      <el-input-number
-                        v-model="scope.row.nearAdd"
-                        :precision="2"
-                        :step="0.01"
-                        :min="0.5"
-                        :max="3"
-                        controls-position="right"
-                      />
-                    </div>
-                  </div>
-                </template>
-              </el-table-column>
             </el-table>
           </div>
         </section>
@@ -590,15 +489,6 @@
                 <dict-tag :options="dict.type.jy_order_status" :value="detail.orderStatus" />
               </el-descriptions-item>
               <el-descriptions-item label="产品">{{ formatProduct(detail) }}</el-descriptions-item>
-              <el-descriptions-item label="镜片厂">
-                <el-tag
-                  v-if="isPendingTagText(formatLensFactory(detail))"
-                  type="danger"
-                  size="small"
-                  :disable-transitions="true"
-                >{{ formatLensFactory(detail) }}</el-tag>
-                <span v-else>{{ formatLensFactory(detail) }}</span>
-              </el-descriptions-item>
               <el-descriptions-item label="通用镜片">{{ formatLens(detail) }}</el-descriptions-item>
               <el-descriptions-item label="渐进多焦点">{{ detail.progressiveMultifocal === 1 ? '是' : '否' }}</el-descriptions-item>
               <el-descriptions-item label="附件" :span="2">
@@ -655,25 +545,6 @@
           </div>
           <div class="section-body">
             <el-descriptions :column="2" border size="small" class="detail-descriptions detail-descriptions--price">
-              <el-descriptions-item label="B价格">
-                <el-tag
-                  v-if="isPendingTagText(formatPriceAmount(formatPriceB(detail)))"
-                  type="danger"
-                  size="small"
-                  :disable-transitions="true"
-                >{{ formatPriceAmount(formatPriceB(detail)) }}</el-tag>
-                <span v-else>{{ formatPriceAmount(formatPriceB(detail)) }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="物流费用">{{ formatPriceAmount(formatDetailLogisticsFee(detail)) }}</el-descriptions-item>
-              <el-descriptions-item label="渐进多焦点价格">
-                <el-tag
-                  v-if="isPendingTagText(formatPriceAmount(formatProgressiveMultifocalPrice(detail)))"
-                  type="danger"
-                  size="small"
-                  :disable-transitions="true"
-                >{{ formatPriceAmount(formatProgressiveMultifocalPrice(detail)) }}</el-tag>
-                <span v-else>{{ formatPriceAmount(formatProgressiveMultifocalPrice(detail)) }}</span>
-              </el-descriptions-item>
               <el-descriptions-item label="合计">
                 <el-tag
                   v-if="isPendingTagText(formatPriceAmount(formatDetailPriceTotal(detail, 'priceB')))"
@@ -1273,11 +1144,6 @@ export default {
       }
       return '-'
     },
-    formatLensFactory(row) {
-      if (!row) return '-'
-      if (String(row.orderStatus) === this.ORDER_STATUS_SUBMIT) return '未分配'
-      return row.lensFactoryTenantName || '-'
-    },
     isUnsetPriceStatus(row) {
       if (!row || row.orderStatus == null) return false
       const status = String(row.orderStatus)