lex-xin 4 gadi atpakaļ
vecāks
revīzija
784c49e9ca

+ 20 - 20
src/views/businessManager/orderManager/financeManager.vue

@@ -349,26 +349,6 @@
                          :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="销售金额"
-                        v-if="form.applyType == 'SELL' || !isAdd"
-                        prop="saleAmount"
-                        :label-width="formLabelWidth">
-            <el-input v-model="form.saleAmount"
-                      @mousewheel.native.prevent
-                      type="number"
-                      :disabled="!isAdd"
-                      placeholder="请输入销售金额" />
-          </el-form-item>
-          <el-form-item label="服务金额"
-                        v-if="form.applyType == 'SERVICE' || !isAdd"
-                        prop="serviceAmount"
-                        :label-width="formLabelWidth">
-            <el-input type="number"
-                      @mousewheel.native.prevent
-                      :disabled="!isAdd"
-                      v-model="form.serviceAmount"
-                      placeholder="请输入收入金额" />
-          </el-form-item>
           <div v-if="form.applyType == 'SELL'">
             <div v-for="(goodsList, index) in form.goodsList"
                  :key="index">
@@ -413,6 +393,26 @@
                          style="margin-left: 5px;"></el-button>
             </div>
           </div>
+          <el-form-item label="销售金额"
+                        v-if="form.applyType == 'SELL' || !isAdd"
+                        prop="saleAmount"
+                        :label-width="formLabelWidth">
+            <el-input v-model="form.saleAmount"
+                      @mousewheel.native.prevent
+                      type="number"
+                      :disabled="!isAdd"
+                      placeholder="请输入销售金额" />
+          </el-form-item>
+          <el-form-item label="服务金额"
+                        v-if="form.applyType == 'SERVICE' || !isAdd"
+                        prop="serviceAmount"
+                        :label-width="formLabelWidth">
+            <el-input type="number"
+                      @mousewheel.native.prevent
+                      :disabled="!isAdd"
+                      v-model="form.serviceAmount"
+                      placeholder="请输入收入金额" />
+          </el-form-item>
           <div class="lookTitle">其它</div>
           <el-form-item label="备注"
                         prop="memo"

+ 23 - 23
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -102,29 +102,6 @@
                      :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="销售金额"
-                    :rules="[{ required: true, message: '请输入销售金额', trigger: 'change' }]"
-                    v-if="form.applyType == 'SELL'"
-                    prop="
-                    saleAmount"
-                    :label-width="formLabelWidth">
-        <el-input v-model="form.saleAmount"
-                  @mousewheel.native.prevent
-                  type="number"
-                  :disabled="!isAdd"
-                  placeholder="请输入销售金额" />
-      </el-form-item>
-      <el-form-item label="服务金额"
-                    v-if="form.applyType == 'SERVICE'"
-                    :rules="[{ required: true, message: '请输入服务金额', trigger: 'change' }]"
-                    prop="serviceAmount"
-                    :label-width="formLabelWidth">
-        <el-input type="number"
-                  @mousewheel.native.prevent
-                  :disabled="!isAdd"
-                  v-model="form.serviceAmount"
-                  placeholder="请输入收入金额" />
-      </el-form-item>
       <div v-if="form.applyType == 'SELL'">
         <div v-for="(goodsList, index) in form.goodsList"
              :key="index">
@@ -168,6 +145,29 @@
                      style="margin-left: 5px;"></el-button>
         </div>
       </div>
+      <el-form-item label="销售金额"
+                    :rules="[{ required: true, message: '请输入销售金额', trigger: 'change' }]"
+                    v-if="form.applyType == 'SELL'"
+                    prop="
+                    saleAmount"
+                    :label-width="formLabelWidth">
+        <el-input v-model="form.saleAmount"
+                  @mousewheel.native.prevent
+                  type="number"
+                  :disabled="!isAdd"
+                  placeholder="请输入销售金额" />
+      </el-form-item>
+      <el-form-item label="服务金额"
+                    v-if="form.applyType == 'SERVICE'"
+                    :rules="[{ required: true, message: '请输入服务金额', trigger: 'change' }]"
+                    prop="serviceAmount"
+                    :label-width="formLabelWidth">
+        <el-input type="number"
+                  @mousewheel.native.prevent
+                  :disabled="!isAdd"
+                  v-model="form.serviceAmount"
+                  placeholder="请输入收入金额" />
+      </el-form-item>
       <div class="lookTitle">其它</div>
       <el-form-item label="提交备注"
                     :label-width="formLabelWidth"