2025-1-15

src/views/modules/quote/detail/primary/quoteDetailCost.vue

@@ -495,12 +495,6 @@ export default {
                                v-model="quoteDetail.testCost" :precision="4" disabled/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="其他成本:" prop="elseCost" :show-message="false">
-              <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.elseCost" :precision="4" disabled/>
-            </el-form-item>
-          </el-col>
           <el-col :span="4">
             <el-form-item label="包装成本:">
               <el-input-number style="width: 100%;" :controls="false"
@@ -513,6 +507,12 @@ export default {
                                v-model="quoteDetail.shippingCost" :step="0" :precision="4" :min="0" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="其他成本:" prop="elseCost" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.elseCost" :precision="4" disabled/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </fieldset>
       <fieldset style="margin-top: 5px;border: 1px solid #777;">

src/views/modules/quote/detail/quoteDetail.vue

@@ -864,12 +864,12 @@ export default {
       <el-tab-pane label="测试" name="test">
         <quote-detail-test v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-test>
       </el-tab-pane>
-      <el-tab-pane label="其他" name="other">
-        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
-      </el-tab-pane>
       <el-tab-pane label="包装&运输" name="otherCost">
         <quote-detail-other-cost v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other-cost>
       </el-tab-pane>
+      <el-tab-pane label="其他" name="other">
+        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
+      </el-tab-pane>
       <el-tab-pane label="成本&价格" name="cost">
         <quote-detail-cost v-if="saveVisible" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>

src/views/modules/quote/detail/quoteGroupDetail.vue

@@ -830,12 +830,12 @@ export default {
       <el-tab-pane label="测试" name="test">
         <quote-detail-test v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-test>
       </el-tab-pane>
-      <el-tab-pane label="其他" name="other">
-        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
-      </el-tab-pane>
       <el-tab-pane label="包装&运输" name="otherCost">
         <quote-detail-other-cost v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other-cost>
       </el-tab-pane>
+      <el-tab-pane label="其他" name="other">
+        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
+      </el-tab-pane>
       <el-tab-pane label="成本&价格" name="cost">
         <quote-detail-cost v-if="saveVisible" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>