Finish Hotfix-zh-174

src/views/finance/receipt_list.vue

@@ -76,8 +76,8 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单
-            </el-button>
+          <!-- <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单 -->
+            <!-- </el-button> -->
         </div>
         <div class="fr">
           
@@ -181,7 +181,7 @@
                   scope.row.status == 'C'
                 " @click="NoExamineFn(scope.row.id)">弃审</el-button>
                 <el-button type="text" class="textColor" @click="seeFn(scope.row.id)">查看</el-button>
-                <el-button type="text" class="textColor" @click="toPrint(scope.row)">打印</el-button>
+                <!-- <el-button type="text" class="textColor" @click="toPrint(scope.row)">打印</el-button> -->
 
               </template>
             </el-table-column>

src/views/sales_policy/components/AddCondition.vue

@@ -487,6 +487,23 @@ export default {
       default: "",
     },
   },
+  watch: {
+    conditList: {
+      handler(newValue, oldValue) {
+      this.conditList = newValue
+      },
+      immediate: true,
+      deep: true
+    },
+    conditList2: {
+      handler(newValue, oldValue) {
+      this.conditList2 = newValue
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+
   data() {
     return {
       base: {
@@ -798,12 +815,15 @@ export default {
     handleAllAdd() {
       this.conditList2 = this.leftData;
       this.leftData = [];
+      this.$refs.multipleTable.clearSelection();
     },
     handleAllDelete() {
       this.conditList2 = [];
     },
+    // 
     handleAdd() {
-      this.conditList2 = this.leftData;
+      this.conditList2 = [...new Set([...this.conditList2,...this.leftData])];
+      this.$refs.multipleTable.clearSelection();
     },
     //去掉相同数据
     resArr(arr1, arr2) {

src/views/supply/deliver/components/design/preview.vue

@@ -79,13 +79,13 @@ export default {
           this.$parent.tableSelection =[]
         }
       })
-      // this.hiprintTemplate.on('printSuccess', function (data) {
-      //   console.log('打印完成')
-      //      addPrint()
-      //     this.hiprintTemplate = {}
-      //     this.$parent.getList()
-      //     this.$parent.tableSelection =[]
-      // })
+      this.hiprintTemplate.on('printSuccess', function (data) {
+        console.log('打印完成')
+          //  addPrint()
+          this.hiprintTemplate = {}
+          this.$parent.getList()
+          this.$parent.tableSelection =[]
+      })
       // this.hiprintTemplate.on('printError', function (data) {
       //   console.log('打印失败')
       //   this.hiprintTemplate = {}

src/views/supply/policy/components/retail_form.vue

@@ -331,15 +331,8 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <!-- v-if="scope.row.rebateRate" -->
-            <template >
+              {{(scope.row.price -(scope.row.qty * scope.row.discAmount) -(((scope.row.price - scope.row.discAmount) * scope.row.qty * ((scope.row.rebateRate || 0) * 100)) / 100))*scope.row.qty  | numToFixed }}
               <!-- {{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100) | numToFixed }} -->
-              {{((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * ((scope.row.rebateRate||0) * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100}}
-
-            </template>
-            <!-- <template v-else>
-              {{ (scope.row.price*scope.row.qty ) | numToFixed }}
-            </template> -->
           </template>
         </el-table-column>
         <el-table-column
@@ -946,6 +939,15 @@ export default {
     //   };
     // },
   },
+  watch: {
+    goodsList: {
+      handler(newValue, oldValue) {
+      this.goodsList = newValue
+      },
+      immediate: true,
+      deep: true
+    }
+  },
 
   created() {
     this.getDictList()
@@ -1369,7 +1371,7 @@ export default {
             this.$set(this.multipleData[i], 'customerWalletId', this.multipleData[i].wallets[0].customerWalletId)
             this.$set(this.multipleData[i], 'serviceName', this.multipleData[i].wallets[0].serviceName)
             this.$set(this.multipleData[i], 'serviceId', this.multipleData[i].wallets[0].serviceId)
-            this.$set(this.multipleData[i],'amount', 0.00)
+            this.$set(this.multipleData[i],'amount', 0)
           }
           arrData = [...arrData, ...this.multipleData[i]]
         }
@@ -1424,7 +1426,7 @@ export default {
               this.$set(this.multipleSelections[i][j], 'customerWalletId', this.multipleSelections[i][j].wallets[0].customerWalletId)
               this.$set(this.multipleSelections[i][j], 'serviceName', this.multipleSelections[i][j].wallets[0].serviceName)
               this.$set(this.multipleSelections[i][j], 'serviceId', this.multipleSelections[i][j].wallets[0].serviceId)
-              this.$set(this.multipleSelections[i][j],'amount',0.00)
+              this.$set(this.multipleSelections[i][j],'amount',0)
             }
             arrData = [...arrData, this.multipleSelections[i][j]]
           }
@@ -1495,7 +1497,7 @@ export default {
             this.$set(item, 'userList', this.userList)
             item.rebateWallets.forEach(j=>{
                if (j.customerWalletId2 === data.customerWalletId2) {
-                  this.$set(item, 'amount', j.amount||0.00)
+                  this.$set(item, 'amount', j.amount||0)
               }
             })
             item.wallets.forEach((k) => {
@@ -1780,10 +1782,10 @@ export default {
           return e === k.customerWalletId
         })[0]
         this.$set(row, 'rebateRate', (obj.rebateRate || 0))
-            this.$set(row,'amount',obj.amount || 0.00)
+            this.$set(row,'amount',obj.amount || 0)
       } else {
         this.$set(row, 'rebateRate', 0)
-         this.$set(row,'amount',0.00)
+        this.$set(row,'amount',0)
       }
 
     },