Merge remote-tracking branch 'origin/master'

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -2216,6 +2216,7 @@ export default {
     show(record, type, prefixNo) {
       //查询单条单据信息
       findBillDetailByNumber({ number: record.number }).then((res) => {
+        console.log('findBillDetailByNumber-----------',res)
         if (res && res.code === 200) {
           let item = res.data
           this.billType = type
@@ -2231,11 +2232,12 @@ export default {
           } else {
             this.model.getAmount = this.model.changeAmount
           }
-          this.model.debt = (
-            this.model.discountLastMoney +
-            this.model.otherMoney -
-            (this.model.deposit + this.model.changeAmount)
-          ).toFixed(2)
+          // this.model.debt = (
+          //   this.model.discountLastMoney +
+          //   this.model.otherMoney -
+          //   (this.model.deposit + this.model.changeAmount)
+          // ).toFixed(2)
+          this.model.debt = item.debt
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model, 'id'))
           })

jshERP-web/src/views/stock/components/checkModal.vue

@@ -283,9 +283,10 @@ export default {
   },
   methods: {
     handleEdit(data) {
+      console.log('handleEdit=====',data)
       this.editForm = { ...data }
       this.editVisible = true
-      this.handleChangeNewInventory(data.newInventory)
+      this.handleChangeNewInventory(data.inventory)
     },
     onSubmitGoods() {
       this.$refs.editFormModel.validate((valid) => {
@@ -460,6 +461,7 @@ export default {
     },
 
     handleChangeNewInventory(val) {
+      console.log('1111111======',val)
       const inventory = this.editForm.inventory ? Number(this.editForm.inventory) : 0
       this.editForm.differenceCount = val - inventory
     },