Browse Source

修改bug

Qukatie 10 months ago
parent
commit
23a5a37905

+ 2 - 2
src/api/basicData/commodityType.js

@@ -17,7 +17,7 @@ export const getList = (current, size, params, goodsTypeId, belongToCorpId) => {
 export const remove = (id) => {
     return request({
         url: '/api/blade-client/goodsdesc/delete',
-        method: 'delete',
+        method: 'post',
         params: {
             id:id
         }
@@ -161,7 +161,7 @@ export const getDetail = (id) => {
 export const priceDelete = (id) => {
   return request({
     url: '/api/blade-client/goodsdesc/priceDelete',
-    method: 'delete',
+    method: 'post',
     params: {
       id:id
     }

+ 4 - 4
src/api/basicData/container.js

@@ -12,7 +12,7 @@ export const getTypeList = (param) => {
 export const typeRemove = (id) => {
   return request({
     url: '/api/blade-client/container/type/delete',
-    method: 'delete',
+    method: 'post',
     params: {
       id:id
     }
@@ -30,7 +30,7 @@ export const typeAdd = (row) => {
 export const typeUpdate = (row) => {
   return request({
     url: '/api/blade-client/container/type/edit',
-    method: 'put',
+    method: 'post',
     data: row
   })
 }
@@ -60,7 +60,7 @@ export const add = (row) => {
 export const update = (row) => {
   return request({
     url: '/api/blade-client/container/edit',
-    method: 'put',
+    method: 'post',
     data : row
   })
 }
@@ -68,7 +68,7 @@ export const update = (row) => {
 export const remove = (id) => {
   return request({
     url: '/api/blade-client/container/delete',
-    method: 'delete',
+    method: 'post',
     params: {
       id:id
     }

+ 4 - 4
src/api/basicData/portinformation.js

@@ -12,7 +12,7 @@ export const getTypeList = (param) => {
 export const typeRemove = (id) => {
   return request({
     url: '/api/blade-client/port/type/delete',
-    method: 'delete',
+    method: 'post',
     params: {
       id:id
     }
@@ -30,7 +30,7 @@ export const typeAdd = (row) => {
 export const typeUpdate = (row) => {
   return request({
     url: '/api/blade-client/port/type/edit',
-    method: 'put',
+    method: 'post',
     data: row
   })
 }
@@ -67,7 +67,7 @@ export const add = (row) => {
 export const update = (row) => {
   return request({
     url: '/api/blade-client/port/edit',
-    method: 'put',
+    method: 'post',
     data : row
   })
 }
@@ -75,7 +75,7 @@ export const update = (row) => {
 export const remove = (id) => {
   return request({
     url: '/api/blade-client/port/delete',
-    method: 'delete',
+    method: 'post',
     params: {
       id:id
     }

+ 1 - 1
src/api/mallManagement/commodity/productList.js

@@ -160,7 +160,7 @@ export const getDetail = (id) => {
 export const priceDelete = (id) => {
   return request({
     url: '/api/blade-client/goodsdesc/priceDelete',
-    method: 'delete',
+    method: 'post',
     params: {
       id: id
     }

+ 1 - 1
src/api/tirePartsMall/salesManagement/outboundWorkOrder.js

@@ -44,7 +44,7 @@ export const submit = (data) => {
 export const shipments = (data) => {
   return request({
     url: '/api/blade-sales-part/ship/logistics',
-    method: 'PUT',
+    method: 'post',
     data: data
   })
 }

+ 2 - 2
src/api/workManagement/mainProject.js

@@ -16,7 +16,7 @@ export function getList(current,size,params) {
 export function editMianProject(data) {
   return request({
     url: '/api/trade-project/project/modify',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -35,7 +35,7 @@ export function projectDetail(id,itemStatus) {
 export function deleteMain(id) {
   return request({
     url: '/api/trade-project/project/delete',
-    method: 'delete',
+    method: 'post',
     params:{
       id : id
     }

+ 6 - 2
src/components/tradeAgency/fee-oceanFreight.vue

@@ -872,6 +872,7 @@ export default {
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
+                        days:1,
                     })
                 } else {
                     this.form.feeCenterListD.push({
@@ -887,6 +888,7 @@ export default {
                         corpEnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpEnName,
                         billCorpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpId,
                         billCorpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpCnName,
+                        days:1
                     })
                 }
             }
@@ -902,6 +904,7 @@ export default {
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
+                        days:1,
                     })
                 } else {
                     this.form.feeCenterListC.push({
@@ -917,14 +920,15 @@ export default {
                         corpEnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpEnName,
                         billCorpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpId,
                         billCorpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpCnName,
+                        days:1
                     })
                 }
             }
         },
         countChange(row) {
-            row.amount = _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0))
+            row.amount =_.round(_.multiply( _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0)), Number(row.days ? row.days : 0)),2)
             if (row.feeCode == 'SFK' || row.feeCode == 'WK') {
-                row.amount = _.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0))
+                row.amount = _.round(_.multiply(_.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0)), Number(row.days ? row.days : 0)),2)
             }
         },
         selectionDChange(list) {

+ 10 - 9
src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -157,16 +157,17 @@ export default {
           prop: "customerName",
           search: true,
           width: 140,
-          type: 'select',
+          // type: 'select',
           overHidden: true,
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          cell:true,
+          // filterable: true,
+          // remote: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         }
           // , {
           //     label: "商品种类",

+ 10 - 9
src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -245,15 +245,16 @@ export default {
           prop: "customerName",
           search: true,
           overHidden: true,
-          type: 'select',
-          filterable:true,
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          cell:true,
+          // type: 'select',
+          // filterable:true,
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         }, {
           label: '仓库',
           prop: "storageName",

+ 10 - 9
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -217,15 +217,16 @@ export default {
           prop: "customerName",
           search: true,
           overHidden: true,
-          filterable: true,
-          type: 'select',
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/page?current=1&size=20&corpType=GYS,KH&cname={{key}}',
+          cell:true,
+          // filterable: true,
+          // type: 'select',
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/page?current=1&size=20&corpType=GYS,KH&cname={{key}}',
         },
         {
           label: "仓库",

+ 2 - 0
src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -756,6 +756,8 @@ export default {
         },
         nodeClick(data) {
             console.log(data, 508)
+            this.inventorySearch.goodsTypeId = data.id
+            this.inventoryOnLoad(this.inventoryPage, { ...this.inventorySearch })
         },
         // 添加商品左侧数据接口
         getAllWorkDicts() {

+ 10 - 9
src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -149,16 +149,17 @@ export default {
           prop: "customerName",
           search: true,
           width: 140,
-          type: 'select',
+          // type: 'select',
           overHidden: true,
-          filterable:true,
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          cell:true,
+          // filterable:true,
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         }
           // , {
           //     label: "商品种类",

+ 11 - 10
src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -144,16 +144,17 @@ export default {
           prop: "customerName",
           search: true,
           width: 140,
-          type: 'select',
-          overHidden: true,
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          cell:true,
+          // type: 'select',
+          // overHidden: true,
+          // filterable: true,
+          // remote: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
         }
           // , {
           //     label: "商品种类",

+ 10 - 9
src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -245,15 +245,16 @@ export default {
           prop: "customerName",
           search: true,
           overHidden: true,
-          filterable:true,
-          type: 'select',
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          cell:true,
+          // filterable:true,
+          // type: 'select',
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
         }, {
           label: '仓库',
           prop: "storageName",

+ 9 - 8
src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -303,14 +303,15 @@ export default {
           type: 'select',
           search: true,
           overHidden: true,
-          filterable:true,
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          cell:true,
+          // filterable:true,
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         },
         {
           label: '显示已完成',

+ 9 - 8
src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -256,14 +256,15 @@ export default {
           search: true,
           remote: true,
           overHidden: true,
-          type: 'select',
-          filterable: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          cell:true,
+          // type: 'select',
+          // filterable: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
         },
         {
           label: '业务员',

+ 9 - 8
src/views/tirePartsMall/salesService/Task/index.vue

@@ -146,14 +146,15 @@ export default {
           width: 140,
           type: 'select',
           overHidden: true,
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          cell:true,
+          // filterable: true,
+          // remote: true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
         },
         // , {
         //     label: "商品种类",

+ 10 - 9
src/views/tirePartsMall/salesService/inStorage/index.vue

@@ -220,15 +220,16 @@ export default {
           prop: "customerName",
           search: true,
           overHidden: true,
-          type: 'select',
-          filterable:true,
-          remote:true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
-          },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          cell:true,
+          // type: 'select',
+          // filterable:true,
+          // remote:true,
+          // props: {
+          //   label: 'cname',
+          //   value: 'cname',
+          //   res: 'data.records'
+          // },
+          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         }, {
           label: "仓库",
           prop: "storageName",

+ 1 - 1
src/views/tirePartsMall/statisticAnalysis/customAnalysis/index.vue

@@ -70,7 +70,7 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
-                        label: "客户名",
+                        label: "客户名",
                         prop: "corpName",
                         type: 'select',
                         search: true,

+ 1 - 1
src/views/tradeAgency/oceanFreightImport/index.vue

@@ -299,7 +299,7 @@ export default {
                     },
                     {
                         label: "品名",
-                        prop: "goodsName",
+                        prop: "commodityCnName",
                         width: "120",
                         overHidden: true
                     },