cz 1 год назад
Родитель
Сommit
7d63150959
2 измененных файлов с 46 добавлено и 42 удалено
  1. 23 21
      src/components/process/EHSD/Contract.vue
  2. 23 21
      src/components/process/EHSD/ContractChange.vue

+ 23 - 21
src/components/process/EHSD/Contract.vue

@@ -294,27 +294,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="包装方式" width="180">
-              <template #default="{ row, $index }">
-                <div style="width: 100%">
-                  <el-form-item :prop="'contractProductList.' + $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 label="数量" width="130">
-              <template #default="{ row, $index }">
-                <div style="width: 100%">
-                  <el-form-item :prop="'contractProductList.' + $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>
-            </el-table-column>
+
             <el-table-column label="单价" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
@@ -372,6 +352,28 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="数量" width="130">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $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>
+            </el-table-column>
+            <el-table-column label="包装方式" width="180">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $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 label="贸易方式" width="140">
               <template #default="{ row, $index }">
                 <div style="width: 100%">

+ 23 - 21
src/components/process/EHSD/ContractChange.vue

@@ -287,27 +287,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="包装方式" width="180">
-              <template #default="{ row, $index }">
-                <div style="width: 100%">
-                  <el-form-item :prop="'contractProductList.' + $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 label="数量" width="130">
-              <template #default="{ row, $index }">
-                <div style="width: 100%">
-                  <el-form-item :prop="'contractProductList.' + $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>
-            </el-table-column>
+
             <el-table-column label="单价" width="140" v-if="showAllData">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
@@ -365,6 +345,28 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="数量" width="130">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $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>
+            </el-table-column>
+            <el-table-column label="包装方式" width="180">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $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 label="贸易方式" width="140" v-if="showAllData">
               <template #default="{ row, $index }">
                 <div style="width: 100%">