Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1080,7 +1080,7 @@ export default {
             (String(row.basis).indexOf('.') + 1) >
             2) ||
         row.basis > 100000 ||
-        row.basis < 0
+        row.basis < -100000
       ) {
         this.$message({
           message: '基差输入错误',
@@ -1103,7 +1103,7 @@ export default {
         .then(() => {
           editStatus({
             flag: 3,
-            basis: '-'+row.basis,
+            basis: '-'+Math.abs(row.basis),
             id: row.id,
           })
             .toPromise()
@@ -1428,9 +1428,9 @@ export default {
       this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
+      this.$set(this.aduitlist, 'baggingNotes', item.baggingNotes)
     },
     aduitconfirm() {
-      debugger
       if (!this.aduitlist.unitPrice) {
         this.$message({
           message: '单价不能为空！',

src/views/salesManagement/salesPlanOrderList.vue

@@ -1400,7 +1400,7 @@ export default {
     },
     //修改基差
     changebasis(item) {
-      editStatus({ basis: this.basis, id: item.id, flag: 3 })
+      editStatus({ basis: Math.abs(this.basis), id: item.id, flag: 3 })
         .toPromise()
         .then((response) => {
           this.$message.success('修改基差成功')

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -164,7 +164,7 @@
           width="100"
           class="table_td"
           prop="waterContent"
-          label="水分(%)>="
+          label="水分(%)<="
         ></el-table-column>
         <el-table-column
           width="100"
@@ -596,7 +596,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      searchType: '',
+      searchType: '1',
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,

src/views/statisticalReport/salesClosingCashierList.vue

@@ -403,7 +403,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      searchType: '',
+      searchType: '1',
       searchKeyWord: '',
       contractType: 2,
       contractNoList: [],

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -158,7 +158,7 @@
           width="100"
           class="table_td"
           prop="waterContent"
-          label="水分(%)>="
+          label="水分(%)<="
         ></el-table-column>
         <el-table-column
           width="100"
@@ -490,7 +490,7 @@ export default {
       tranTypeKey: 1,
       collectmoney: 0,
       pageSize: 10,
-      searchType: '',
+      searchType: '1',
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,