瀏覽代碼

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

chenrui 3 年之前
父節點
當前提交
2b45a5135b

+ 0 - 1
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -188,7 +188,6 @@ export default {
       const zb = this.$hasPermissions('B_SUPPLIER_ZB')
       const sj = this.$hasPermissions('B_SUPPLIER_SJ')
       let params = {}
-      params.purchaseTargetType = 'DEALER_UP'
       // 只能向上级采购
       if (sj) {
         params.purchaseTargetType = 'DEALER_UP'

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -78,7 +78,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')&&($hasPermissions('B_SUPPLIER_SJ')||$hasPermissions('B_SUPPLIER_ZB'))" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.151:80/qpls-md',
-        // target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
+        // target: 'http://192.168.16.103:8503/qpls-md',
+        target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
         // target: 'http://qpls-md.360arrow.com/qpls-md', //  Éú²ú
         // ws: false,
         ws: true,