Browse Source

Merge branch 'develop_yh15' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh15

chenrui 2 năm trước cách đây
mục cha
commit
24c51808f0

+ 1 - 1
public/version.json

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

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -19,7 +19,7 @@
       <!-- 通知 -->
       <notice-icon class="action"/>
       <!-- 皮肤设置 -->
-      <a-popover trigger="click" title="系统设置">
+      <a-popover title="系统设置">
         <div slot="content" :style="{width: fontSize == 'large' ? '340px' : '300px'}">
           <a-form-model :label-col="{ span: 9 }" :wrapper-col="{ span: 15 }">
             <a-form-model-item label="主题">

+ 5 - 0
src/views/common/custList.vue

@@ -39,6 +39,10 @@ export default {
       type: String || Number,
       default: undefined
     },
+    notSn:{
+      type: String || Number,
+      default: ''
+    },
     isEnabled: { // 是否只查启用状态
       type: Boolean,
       default: false
@@ -90,6 +94,7 @@ export default {
           return
         }
         this.data = res.data && res.data.list ? res.data.list : []
+        this.data = this.data.filter(item => item.customerSn != this.notSn)
         this.fetching = false
       })
     },

+ 1 - 1
src/views/customerManagement/customerInfo/mergeCustomerModal.vue

@@ -22,7 +22,7 @@
           <div>{{ mainCustomerName }}</div>
         </a-form-model-item>
         <a-form-model-item label="被合并的客户名称:" prop="customerSnSource">
-          <custList ref="custList" dealerDisabled @change="custChange" placeholder="输入客户名称搜索"></custList>
+          <custList ref="custList" :notSn="form.customerSnTarget" dealerDisabled @change="custChange" placeholder="输入客户名称搜索"></custList>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">

+ 7 - 7
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -144,7 +144,7 @@ export default {
     },
     width: {
       type: [String, Number],
-      default: '70%'
+      default: '80%'
     },
     zIndex: {
       type: Number,
@@ -216,12 +216,12 @@ export default {
       return this.queryParam.code || this.queryParam.name || this.queryParam.productBrandSn || this.queryParam.productTypeSn1
     },
     tableWidth () {
-      let w = 1260
+      let w = 1410
       if (this.isDealerUp) {
-        w = 1360
+        w = 1510
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        w = this.isDealerUp ? 1360 : 1260
+        w = this.isDealerUp ? 1510 : 1410
       }
       return w
     },
@@ -230,8 +230,8 @@ export default {
       const arr = [
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
-        { title: '在途数', dataIndex: 'inTransit', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '150px', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '在途数', dataIndex: 'transitQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '80px', align: 'center' },
         { title: '单位', dataIndex: 'unit', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -246,7 +246,7 @@ export default {
         arr.splice(2, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } })
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(this.isDealerUp ? 3 : 2, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(this.isDealerUp ? 4 : 3, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
 
       return arr

+ 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 })
       })
     },
     //  获取详情

+ 1 - 1
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -83,7 +83,7 @@ export default {
         { title: '销售时间', dataIndex: 'salesBillEntity.createDate', width: 250, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售价', dataIndex: 'price', width: 150, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '销售数量', dataIndex: 'qty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户名称', dataIndex: 'salesBillEntity.buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '客户名称', dataIndex: 'salesBillEntity.buyerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       list: [],
       loading: false,

+ 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 })
       })
     },
     //  获取详情

+ 2 - 4
src/views/salesManagement/salesQueryNew/chooseShelfProduct.vue

@@ -250,6 +250,7 @@ export default {
             }
           }
           this.spinning = false
+          this.setTableH()
           return data
         })
       },
@@ -404,9 +405,7 @@ export default {
     },
     setTableH () {
       this.$nextTick(() => {
-        const searchBoxH = this.$refs.searchBox.offsetHeight
-        const searchBoxH1 = this.$refs.searchBox1.offsetHeight
-        this.tableHeight = window.innerHeight - (this.curTab == 1 ? searchBoxH : searchBoxH1) - 215
+        this.tableHeight = window.innerHeight - (this.curTab == 1 ? this.$refs.searchBox.offsetHeight : this.$refs.searchBox1.offsetHeight) - 255 
       })
     }
   },
@@ -425,7 +424,6 @@ export default {
       } else {
         this.$nextTick(() => {
           this.curTab = 1
-          this.setTableH()
         })
       }
     }

+ 4 - 5
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"
@@ -27,8 +28,8 @@
             <a-button type="link" v-if="detailData&&detailData.totalCategory" @click="showSearch=!showSearch" :class="showSearch?'button-error':'button-default'"> <a-icon type="search" /> 筛选</a-button>
             <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
             <a-button v-if="detailData&&detailData.totalCategory" id="salesNewOrderEdit-add-btn" type="link" @click="openChooseProduct=true"><a-icon type="plus" />添加产品</a-button>
-            <a-divider type="vertical" />
-            <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')">
+            <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
+            <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')&&detailData&&detailData.totalCategory">
               <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
               <a-menu slot="overlay">
                 <a-menu-item>
@@ -783,9 +784,7 @@ export default {
             const priceType = vm.$route.params.priceType
             vm.$refs.partQuery.pageInit(buyerSn, priceType, vm.salesBillSn)
             if(vm.detailData.totalCategory){
-              vm.$nextTick(()=>{
-                vm.$refs.table.refresh(true)
-              })
+              vm.resetForm()
             }else{
               vm.spinning = false
             }

+ 1 - 1
vue.config.js

@@ -211,7 +211,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.183:8503/qpls-md',
+        // target: 'http://192.168.0.103/qpls-md',
         target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,