Explorar el Código

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui hace 1 año
padre
commit
106df09958

+ 2 - 1
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -50,7 +50,8 @@
           class="sTable"
           ref="table"
           size="small"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: 500 }"

+ 5 - 5
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -187,7 +187,7 @@
             this.colspanNums = 5
             if (this.$hasPermissions(this.authCode + '_costPrice')) { //  成本价权限
               this.colspanNums = this.colspanNums + 1
-              arr.push({ title: '成本价', field: 'showCost', width: 80,key: "f", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
+              arr.push({ title: '成本价', field: 'showCost', width: 80,key: "f", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
             }
             this.colspanNums = this.colspanNums + 2
             arr = arr.concat([
@@ -197,20 +197,20 @@
 
             if (this.$hasPermissions(this.authCode + '_provincePrice')) {
               this.colspanNums = this.colspanNums + 1
-              arr.push({ title: '省级价', field: 'provincePrice', width: 80,key: "i", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
+              arr.push({ title: '省级价', field: 'provincePrice', width: 80,key: "i", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
             }
             // 是否勾选市级价格
             if (this.isCityPrice) {
               this.colspanNums = this.colspanNums + 1
-                arr.push({ title: '市级价', field: 'cityPrice', width: 80,key: "j", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
+                arr.push({ title: '市级价', field: 'cityPrice', width: 80,key: "j", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} })
                 if (this.$hasPermissions(this.authCode + '_salesPrice')) { //  售价权限
                   this.colspanNums = this.colspanNums + 1
-                    arr.push({ title: '销售价', field: 'price', width: 120,key: "k", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return discountPriceFormat(row,row[column.field],h)} })
+                    arr.push({ title: '销售价', field: 'price', width: 100,key: "k", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return discountPriceFormat(row,row[column.field],h)} })
                 }
             } else {
                 if (this.$hasPermissions(this.authCode + '_salesPrice')) { //  售价权限
                   this.colspanNums = this.colspanNums + 1
-                    arr.push({ title: '销售价', field: 'price', width: 120,key: "l", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return discountPriceFormat(row,row[column.field],h)} })
+                    arr.push({ title: '销售价', field: 'price', width: 100,key: "l", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return discountPriceFormat(row,row[column.field],h)} })
                 }
             }
 

+ 1 - 1
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -285,7 +285,7 @@
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.spinning = false
-              _this.$emit('refashTable')
+              _this.$emit('refashTable', true)
             } else {
               record.qty = record.qtyBackups
               _this.spinning = false

+ 4 - 2
src/views/salesManagement/waitDispatchNew/edit.vue

@@ -160,9 +160,11 @@ export default {
         this.isInster = false
       })
     },
-    refashTable(){
+    refashTable(flag){
       this.getTotalData()
-      // this.$refs.partQuery.resetSearchForm()
+      if(flag){
+        this.$refs.partQuery.resetSearchForm()
+      }
     },
     //  销售单详情
     getOrderDetail () {

+ 2 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -318,11 +318,11 @@ export default {
       this.colspanNums = 6
       if (this.$hasPermissions('B_salesDispatch_salesPrice')) { //  售价权限
         this.colspanNums = this.colspanNums + 1
-        arr.push({ title: '销售价', field: 'price', width: 80,key: "f", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row,row[column.field],h)} })
+        arr.push({ title: '销售价', field: 'price', width: 80,key: "f", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row,row[column.field],h)} })
       }
       if (this.$hasPermissions('B_salesDispatch_costPrice')) {
         this.colspanNums = this.colspanNums + 1
-        arr.push({ title: '成本价', field: 'showCost', width: 80,key: "g", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return _this.toThousands(row[column.field])||'--'} })
+        arr.push({ title: '成本价', field: 'showCost', width: 80,key: "g", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return _this.toThousands(row[column.field])||'--'} })
       }    
       this.colspanNums = this.colspanNums + 8
       arr = arr.concat([