lilei 2 years ago
parent
commit
c2ec1b4948

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677650695490
+  "version": 1677663459039
 }

+ 4 - 2
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -266,7 +266,8 @@ export default {
       const arr = [
         { title: '序号', key: "a", field: 'no', width: '5%', align: 'center', operationColumn: false },
         { title: '产品编码',key: "b", field: 'productCode', width: '10%', align: 'center', operationColumn: false},
-        { title: '产品名称',key: "c", field: 'productName', width: '35%', align: 'center', operationColumn: false,ellipsis: {showTitle: true} },
+        { title: '产品名称',key: "c", field: 'productName', width: '25%', align: 'center', operationColumn: false,ellipsis: {showTitle: true} },
+        { title: '可用库存',key: "j", field: 'currentStockQty', width: '10%', align: 'center', operationColumn: false},
         { title: '采购数量',key: "d", width: '10%', align: 'center', operationColumn: false, 
         renderBodyCell: ({ row, column, rowIndex }, h) => {
             return <qtyComp row={row} column={column} rowIndex={rowIndex} that={_this} />
@@ -278,7 +279,7 @@ export default {
         }}
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(3, 0, { title: '采购单价',key: "h", field: 'discountedPriceText', width: '10%', align: 'right', operationColumn: false})
+        arr.splice(4, 0, { title: '采购单价',key: "h", field: 'discountedPriceText', width: '10%', align: 'right', operationColumn: false})
         arr.splice(6, 0, { title: '采购金额',key: "i", field: 'discountedAmountText', width: '10%', align: 'right', operationColumn: false})
       }
       return arr
@@ -313,6 +314,7 @@ export default {
             row.productUnit = row.dealerProductEntity.unit || '--'
             row.discountedPriceText = (row.discountedPrice||row.discountedPrice==0)?this.toThousands(row.discountedPrice, 2):'--'
             row.discountedAmountText = (row.discountedAmount||row.discountedAmount==0)?this.toThousands(row.discountedAmount, 2):'--'
+            row.currentStockQty = (row.currentStockQty||row.currentStockQty==0)?row.currentStockQty:'--'
           }
           this.localDataSource = data.list
           this.disabled = false

+ 2 - 1
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -355,10 +355,11 @@ export default {
       if (data.shippingAddressProvinceSn) { this.getArea('city', data.shippingAddressProvinceSn) }
       if (data.shippingAddressCitySn) { this.getArea('district', data.shippingAddressCitySn) }
       this.form = Object.assign(this.form, data)
+      this.form.buyerName = data.buyerNameCurrent || data.buyerName
       this.buyerSnBak = this.form.buyerSn
       this.priceTypeBak = this.form.priceType
       this.$nextTick(() => {
-        this.$refs.custList.setData({ key: data.buyerSn, label: data.buyerName, row: data })
+        this.$refs.custList.setData({ key: data.buyerSn, label: data.buyerNameCurrent || data.buyerName, row: data })
       })
     },
     //  获取详情

+ 2 - 1
src/views/salesManagement/salesQueryNew/chooseCustomModal.vue

@@ -355,10 +355,11 @@ export default {
       if (data.shippingAddressProvinceSn) { this.getArea('city', data.shippingAddressProvinceSn) }
       if (data.shippingAddressCitySn) { this.getArea('district', data.shippingAddressCitySn) }
       this.form = Object.assign(this.form, data)
+      this.form.buyerName = data.buyerNameCurrent || data.buyerName
       this.buyerSnBak = this.form.buyerSn
       this.priceTypeBak = this.form.priceType
       this.$nextTick(() => {
-        this.$refs.custList.setData({ key: data.buyerSn, label: data.buyerName, row: data })
+        this.$refs.custList.setData({ key: data.buyerSn, label: data.buyerNameCurrent || data.buyerName, row: data })
       })
     },
     //  获取详情

+ 1 - 0
src/views/salesManagement/salesQueryNew/edit.vue

@@ -4,6 +4,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a class="billno">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+          <!-- <span style="margin-left:10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span> -->
           <a-button
             id="salesEdit-edit-btn"
             type="link"