Browse Source

Merge remote-tracking branch 'origin/master'

liyuan 4 weeks ago
parent
commit
7c5dfe9d0d

+ 8 - 0
src/api/basicData/configuration.js

@@ -296,3 +296,11 @@ export function calculateInterestAmount(data) {
         data: data
     })
 }
+  //生成采购是否显示
+  export function policyMatching(data) {
+    return request({
+        url: '/api/blade-purchase-sales/order/policyMatching',
+        method: 'get',
+        params: data
+    })
+  }

+ 2 - 1
src/views/businessManagement/receipt/index.vue

@@ -36,7 +36,8 @@
             }}</span>
         </template>
         <template slot="salesCompanySearch">
-          <select-component v-model="search.salesCompany" :configuration="configuration"></select-component>
+          <!-- <select-component v-model="search.salesCompany" :configuration="configuration"></select-component> -->
+               <crop-select v-model="search.salesCompany" corpType="GS"></crop-select>
         </template>
         <template slot-scope="scope" slot="salesCompany">
           {{ scope.row.salesCompanyName }}

File diff suppressed because it is too large
+ 597 - 225
src/views/businessManagement/salesOrder/detailsPageEdit.vue


Some files were not shown because too many files changed in this diff