zhouhao 2 éve
szülő
commit
c639529e78

+ 2 - 0
src/components/SalesDialog/SalesDialog.vue

@@ -93,6 +93,8 @@ export default {
     },
     // 监听勾选变化
     selectionChange(data) {
+
+
       this.recordSelected = data
     },
     addWarehouse() {

+ 1 - 1
src/views/finance/wallet.vue

@@ -79,7 +79,7 @@
             <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="right" label="余额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.amount | numToFixed }}
+                {{ (scope.row.amount-scope.row.usedCreditAmount)  | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column

+ 7 - 0
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -164,6 +164,13 @@ export default {
       return listOrder(...p)
     },
     confirm(selected) {
+        for (let i = 0; i < selected.length; i++) {
+          if (selected[0].id != selected[i].id){
+            this.$errorMsg('不能选择不一样的销售单')
+            return
+          }
+        }
+
       // console.log(selected)
       this.dataList = [...this.dataList, ...selected]
       for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {