Browse Source

财务订单管理

111
mo 4 years ago
parent
commit
97bc57bf1a

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-1d3232c0.d4abcc1d.css

@@ -0,0 +1 @@
+.newBand[data-v-12d5d390]{display:inline-block}[data-v-12d5d390] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-12d5d390]{display:inline-block}.lookTitle[data-v-12d5d390]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

+ 0 - 1
dist/static/css/chunk-54cb32b4.3cb329b6.css

@@ -1 +0,0 @@
-.lookTitle[data-v-5db2f604]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-5db2f604]{display:inline-block}

+ 0 - 1
dist/static/css/chunk-757ffb42.fd15e9b1.css

@@ -1 +0,0 @@
-.newBand[data-v-684c63a6]{display:inline-block}[data-v-684c63a6] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-684c63a6]{display:inline-block}.lookTitle[data-v-684c63a6]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

+ 1 - 0
dist/static/css/chunk-7bfdb41d.1c0118f5.css

@@ -0,0 +1 @@
+.lookTitle[data-v-fe20395e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-fe20395e]{display:inline-block}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c647fe6e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1d3232c0.e2f73336.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-54cb32b4.002712d5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-757ffb42.160ea9dd.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7bfdb41d.409a5d7a.js


+ 5 - 2
src/views/businessManager/orderManager/financeManager.vue

@@ -338,6 +338,7 @@
             <el-select class="multiple"
                        style="width: 100% !important;"
                        v-model.trim="form.applyType"
+                       @change="changeApplyType"
                        filterable
                        clearable
                        :disabled="!isAdd"
@@ -869,7 +870,7 @@ export default {
             this.form = {
               routeOrganId: orderInfo.organId,
               transNo: orderInfo.transNo,
-              userId: orderInfo.userId,
+              userId: orderInfo.userId ? orderInfo.userId : '',
               type: "OTHER",
               merNo: orderInfo.merNos,
               actualAmount: orderInfo.actualAmount,
@@ -881,7 +882,6 @@ export default {
               applyType: 'SELL'
             },
               this.$set(this.form, 'goodsList', res.data.sellOrders.map(item => { return { id: item.goodsId, number: item.num } }))
-            console.log(this.form)
             this.routeOrderStatus = true
           })
         }
@@ -956,6 +956,9 @@ export default {
         newStr += `<p>${item}</p>`
       })
       return newStr
+    }, changeApplyType (val) {
+      this.form.serviceAmount = null
+      this.form.saleAmount = null
     }
   }
 };

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

@@ -242,7 +242,7 @@ export default {
             serviceAmount: orderInfo.serviceAmount,
             saleAmount: orderInfo.saleAmount,
             schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId,
+            userId: orderInfo.userId ? orderInfo.userId : '',
             auditComment: orderInfo.auditComment
           }
           this.auditStatus = orderInfo.auditStatus

Some files were not shown because too many files changed in this diff