zh 2 年之前
父节点
当前提交
0d3edb054e

+ 3 - 3
src/api/priceType.js

@@ -16,7 +16,7 @@ export function exportProductPriceListV2(data, name) {
 }
 export function addProductPrice(params) {
   return request({
-    url: `/product-price/add`,
+    url: `/price-type/add`,
     method: 'post',
     data: params
   })
@@ -24,7 +24,7 @@ export function addProductPrice(params) {
 
 export function editProductPrice(params) {
   return request({
-    url: `/product-price/edit`,
+    url: `/price-type/edit`,
     method: 'post',
     data: params
   })
@@ -38,7 +38,7 @@ export function updateProductPriceStatus(params) {
 }
 export function getProductPriceDetail(params) {
   return request({
-    url: `/product-price/detail`,
+    url: `/price-type/detail`,
     method: 'get',
     params
   })

+ 12 - 8
src/views/sales_policy/components/OperationRecords.vue

@@ -1,12 +1,14 @@
 <template>
   <div>
     <h4>操作记录</h4>
-    <zj-table
-      :table-attributes="tableAttributes"
-      :is-drop="true"
-      :columns="columns"
-      :table-data="tableData"
-    />
+    <div>
+      <zj-table
+        :table-attributes="tableAttributes"
+        :is-drop="true"
+        :columns="columns"
+        :table-data="tableData"
+      />
+    </div>
   </div>
 </template>
 
@@ -21,7 +23,9 @@ export default {
   },
   data() {
     return {
-      tableAttributes: {},
+      tableAttributes: {
+        maxHeight: 600
+      },
       tableData: []
     }
   },
@@ -54,7 +58,7 @@ export default {
     }
   },
   mounted() {
-    this.policyId && this.getCommonLogList()
+    this.getCommonLogList()
   },
   methods: {
     getCommonLogList() {

+ 9 - 2
src/views/sales_policy/components/TabelTransfer.vue

@@ -730,6 +730,8 @@ export default {
       formData.append('file', file)
 
       formData.append('policyId', this.comCode || this.code)
+      formData.append('type', this.policyType)
+
       // formData.append("mainId", this.searchForm.mainId);
       const result = await handleImport('policy/limit/import', formData)
       console.log(result)
@@ -950,10 +952,15 @@ export default {
         .map(k => {
           return k.customerId
         })
-        .join('')
+        .join(',')
+      const dis = this.selectedData
+        .map(k => {
+          return k.id
+        })
+        .join(',')
       const params = {
         customerIds,
-        policyId: this.comCode || this.code
+        dis
       }
       if (type) {
         params.limitQty = this.limitQty

+ 10 - 5
src/views/sales_policy/components/details.vue

@@ -498,7 +498,7 @@
                   :ex-url="'policy/limit/export'"
                   :ex-params="exParams"
                 />
-                <el-button v-if="list.length" type="primary" size="mini" @click="handelBatchData">批量修改</el-button>
+                <el-button v-if=" detail.type !=='PROVISION' &&list.length" type="primary" size="mini" @click="handelBatchData">批量修改</el-button>
 
                 <el-divider />
               </div>
@@ -645,7 +645,7 @@
           <el-button v-if="isShow == 5" type="primary" size="default" @click="handleSave">保存</el-button>
         </div>
       </div>
-      <operation-records v-if="detail" :policy-id="detail.code" />
+      <operation-records v-if="detail && detail.code" :policy-id="detail.code" />
       <el-dialog
         title="批量修改"
         :visible.sync="visible"
@@ -1236,7 +1236,7 @@ export default {
       this.batchPageSizes = 10
       this.limitQty = 0
       this.maxBuyNum = 0
-      this.minBuyNum = ''
+      this.minBuyNum = 0
       this.limitQtyKeyWord = ''
       this.buyNumKeyWord = ''
     },
@@ -1253,10 +1253,15 @@ export default {
         .map(k => {
           return k.customerId
         })
-        .join('')
+        .join(',')
+      const ids = this.selectedData
+        .map(k => {
+          return k.id
+        })
+        .join(',')
       const params = {
         customerIds,
-        policyId: this.id,
+        ids,
         minBuyNum: this.minBuyNum,
         maxBuyNum: this.maxBuyNum
       }

+ 4 - 4
src/views/sales_policy/components/replaceRecordForm.vue

@@ -75,7 +75,7 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '货品编码',
+            label: '物料代码',
             prop: 'number'
           },
           render: (h, { column, row, index }) => {
@@ -104,7 +104,7 @@ export default {
         },
         {
           columnAttributes: {
-            label: '品名称',
+            label: '品名称',
             prop: 'name'
           }
         },
@@ -222,7 +222,7 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '货品编码',
+            label: '物料代码',
             prop: 'number'
           },
           render: (h, { column, row, index }) => {
@@ -251,7 +251,7 @@ export default {
         },
         {
           columnAttributes: {
-            label: '品名称',
+            label: '品名称',
             prop: 'name'
           }
         },

+ 2 - 2
src/views/supply/salesReturnOrder/salesReturnOrderDetail.vue

@@ -220,14 +220,14 @@ export default {
         {
           columnAttributes: {
             label: '存货编码',
-            prop: 'k3CategoryNumber',
+            prop: 'materialoldMumber',
             width: 200
           }
         },
         {
           columnAttributes: {
             label: '物料代码',
-            prop: 'materialOldNumber',
+            prop: 'materialCode',
             width: 200
           }
 

+ 1 - 2
src/views/supply/transferOrder/transferOrderForm.vue

@@ -1052,8 +1052,7 @@ export default {
     },
     handleClearSelection() {
       this.recordSelected = []
-      this.$refs.pageRef &&
-        this.$refs.pageRef.$children[0].$children[0].$children[2].$children[0].$children[0].clearSelection()
+      this.$refs.pageRef && this.$refs.pageRef.refreshList()
     },
     handleChange(e) {
       if (e) {