keyword 替换，物料和供应商

src/components/my-modal-form/material-table.vue

@@ -287,7 +287,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/components/my-modal-form/my-modal-material.vue

@@ -141,7 +141,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/components/my-tree/my-tree.vue

@@ -232,14 +232,14 @@ export default {
                 }
               }
             }),
-            h('Button', {
-              props: Object.assign({}, this.buttonProps, {
-                icon: 'ios-remove'
-              }),
-              on: {
-                click: () => { this.remove(root, node, data) }
-              }
-            })
+            // h('Button', {
+            //   props: Object.assign({}, this.buttonProps, {
+            //     icon: 'ios-remove'
+            //   }),
+            //   on: {
+            //     click: () => { this.remove(root, node, data) }
+            //   }
+            // })
           ])
         ])
       } else if (data.isHiddenEditBtn) {
@@ -413,14 +413,14 @@ export default {
                 }
               }
             }),
-            h('Button', {
-              props: Object.assign({}, this.buttonProps, {
-                icon: 'ios-remove'
-              }),
-              on: {
-                click: () => { this.remove(root, node, data) }
-              }
-            })
+            // h('Button', {
+            //   props: Object.assign({}, this.buttonProps, {
+            //     icon: 'ios-remove'
+            //   }),
+            //   on: {
+            //     click: () => { this.remove(root, node, data) }
+            //   }
+            // })
           ])
         ])
       }

src/view/base-manage/material-maintenance/material-maintenance.vue

@@ -323,7 +323,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -541,7 +541,7 @@ export default {
         })
         
       } else if (type === 'del') {
-
+        
         DeleteMaterialCategory({ code: target.value }).then(res => {
           if (res.code === 0) {
             this.$Message.info(res.msg)

src/view/base-manage/provider-maintenance/my-form.vue

@@ -215,17 +215,13 @@ export default {
       }
     },
     cfm () {
-      FacPriceChange({
-        applyUser: this.$store.state.user.name,
-        applyDepartment: this.$store.state.user.dept,
-        applyDateTime: this.$dayjs().format('YYYY-MM-DD'),
-        factoryPriceId: this.data.id,
-        materialCode: this.data.materialCode,
-        newPrice: this.price,
-        remark: this.remark,
-        purchaseBillNoList: this.purchaseBillNoList
-      }).then(res => {
-        if (res.code === 0) {
+      console.log(this.data)
+      this.$post('/api/storage-restructure/supplierPrice/updateFlowCreate',{
+        id:this.data.id,
+        remarks:this.remark,
+        price:this.price
+      }).then(res=>{
+        if(res.code == 200){
           this.$Message.info(res.msg || '修改成功')
           this.cancel()
         }

src/view/base-manage/provider-maintenance/provider-maintenance.vue

@@ -893,7 +893,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/base-manage/provider-maintenance/provider-maintenance2.vue

@@ -89,7 +89,6 @@
 </template>
 
 <script>
-import { GetFactoryPageList, FactoryAdd, FactoryUpdate, FactoryDelete, GetMaterialCategoryZTree } from '@/api/baseData'
 import { GetUserPageList } from '@/api/user'
 import MyTable from '_c/my-table/my-table2'
 import MyModalForm from '_c/my-modal-form/my-modal-form'
@@ -1089,7 +1088,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/base-manage/provider-maintenance/provider-price-maintenance.vue

@@ -24,13 +24,7 @@
 </template>
 
 <script>
-import {
-  GetFacPricePageList,
-  FacPriceAdd,
-  FacPriceChange,
-  FacPriceDelete,
-  GetFactorySelectItem
-} from '@/api/baseData'
+
 import MyTable from '_c/my-table/my-table'
 import MyModalForm from '_c/my-modal-form/my-modal-form'
 import MyForm from './my-form'
@@ -59,7 +53,7 @@ export default {
       formConfig: [
         {
           type: 'select',
-          key: 'facId',
+          key: 'supplierId',
           label: '供应商',
           list: []
         },
@@ -246,16 +240,6 @@ export default {
                   },
                   on: {
                     click: () => {
-                      // for (const key in params.row) {
-                      //   this.formData[key] = params.row[key]
-                      // }
-                      // this.formData.code = params.row.materialCode
-                      // this.formData.name = params.row.materialName
-                      // this.formData.applyUser = this.$store.state.user.name
-                      // this.formData.applyDateTime = this.$dayjs().format('YYYY-MM-DD')
-                      // // this.formData.name = params.row.materialName
-                      // // this.$set(this.formData, 'applyUser', this.$store.state.user.name)
-                      // this.formType = 'edit'
                       this.formData = { ...params.row }
                       this.updShow = true
                     }
@@ -276,10 +260,10 @@ export default {
                       this.$MyModal
                         .show({ text: '是否删除？' })
                         .$on('confirm', () => {
-                          FacPriceDelete({
-                            id: params.row.id
-                          }).then(res => {
-                            if (res.code === 0) {
+                          this.$post('/api/storage-restructure/supplierPrice/delete',{
+                            id:params.row.id
+                          }).then(res=>{
+                            if(res.code == 200){
                               this.$Message.info(res.msg)
                               this.getList()
                             }
@@ -297,7 +281,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -336,28 +320,33 @@ export default {
   },
   methods: {
     cfm (type, formData) {
+      console.log(formData)
       if (type === 'add') {
-        FacPriceAdd({
-          ...formData,
-          materialCode: formData.code
-        }).then(res => {
-          if (res.code === 0) {
+        this.$post('/api/storage-restructure/supplierPrice/add',{
+          supplierId:formData.supplierId,
+          materialId:formData.id,
+          price:formData.price
+        }).then(res=>{
+          if(res.code == 200){
             this.show = false
             this.$Message.info(res.msg)
             this.getList()
           }
         })
+        
       } else if (type === 'edit') {
-        FacPriceChange({
-          ...formData,
-          factoryPriceId: formData.id
-        }).then(res => {
-          if (res.code === 0) {
+        this.$post('/api/storage-restructure/supplierPrice/updateFlowCreate',{
+          id:formData.factoryPriceId,
+          remarks:formData.remark,
+          price:formData.price
+        }).then(res=>{
+          if(res.code == 200){
             this.updShow = false
             this.$Message.info(res.msg)
             this.getList()
           }
         })
+        
       }
     },
     // 检索条件事件处理
@@ -376,7 +365,7 @@ export default {
           this.$router.go(-1)
           break
         case 'export':
-          this.$post('/api/storage-restructure/supplierPrice/list',{
+          this.$post('/api/storage-restructure/supplierPrice/page',{
             pageNum:1,
             pageSize:500,
           }).then(res=>{
@@ -416,10 +405,11 @@ export default {
         pageSize: 500,
       }).then(res=>{
         
-        this.formConfig[0].list = res.result.map(item => {
+        this.formConfig[0].list = res.data.records.map(item => {
           return {
             ...item,
-            label: item.text
+            label: item.supplierName,
+            value:item.id
           }
         })
         console.log(res)

src/view/base-manage/provider-maintenance/purchaseList.vue

@@ -155,7 +155,7 @@ export default {
 			tableFilter: [
 				{
 					name: 'Input',
-					value: 'key',
+					value: 'keyword',
 					placeholder: '请输入关键字',
 				},
 				{

src/view/base-manage/warehouse-maintenance/subarea-manage.vue

@@ -134,7 +134,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/base-manage/warehouse-maintenance/warehouse-maintenance.vue

@@ -149,7 +149,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/index/msg/msg.vue

@@ -328,7 +328,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/index/schedule/contract-modal.vue

@@ -149,7 +149,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/index/schedule/schedule.vue

@@ -416,7 +416,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/contract/contract.vue

@@ -540,7 +540,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/contract/modal.vue

@@ -254,7 +254,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/contract/tab-modal.vue

@@ -857,7 +857,7 @@ export default {
       bqTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -897,7 +897,7 @@ export default {
       zjTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -916,7 +916,7 @@ export default {
       rkTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -943,7 +943,7 @@ export default {
       dfyfTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -969,7 +969,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/material-apply/material-apply.vue

@@ -98,7 +98,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/pay/bill.vue

@@ -71,7 +71,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/material-manege/pay/modal.vue

@@ -621,7 +621,7 @@ export default {
       zjTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -648,7 +648,7 @@ export default {
       rkTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -675,7 +675,7 @@ export default {
       dfyfTableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -701,7 +701,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/other-manage/contract-list-form.vue

@@ -128,7 +128,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/other-manage/test-print.vue

@@ -203,7 +203,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/provider-manage/provider-shipment-manage/provider-shipment-manage.vue

@@ -207,7 +207,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-in-manage/return-material/contract-list-form.vue

@@ -129,7 +129,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-in-manage/store-in-record/store-in-record.vue

@@ -121,7 +121,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-manage/store-manage/components/my-modal-form/my-modal-material-update.vue

@@ -230,7 +230,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字',
           e: 'change'
         },

src/view/store-manage/store-manage/components/my-modal-form/my-modal-material.vue

@@ -249,7 +249,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字',
           e: 'change'
         },

src/view/store-manage/store-material/store-material.vue

@@ -176,7 +176,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-manage/store-material/write-list-form.vue

@@ -103,7 +103,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-manage/store-update/store-update.vue

@@ -211,7 +211,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-out-manage/apply-manage/apply-manage.vue

@@ -183,7 +183,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-out-manage/error-out/error-out.vue

@@ -127,7 +127,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/store-out-manage/store-out-record/store-out-record.vue

@@ -161,7 +161,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/dictionary/dictionary.vue

@@ -136,7 +136,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/menu.vue

@@ -172,7 +172,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/role.vue

@@ -288,7 +288,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/store-update/store-update.vue

@@ -125,7 +125,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/user.vue

@@ -333,7 +333,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/system-manage/user2.vue

@@ -321,7 +321,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {

src/view/tag-manage/tag-new/tag-new.vue

@@ -54,7 +54,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {