lilei vor 1 Jahr
Ursprung
Commit
54eb126f33

+ 2 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -137,7 +137,7 @@
         <div class="table-operator" style="display: flex;justify-content: space-between;align-items: center;">
           <div style="padding-right: 15px;">
             <a-button type="primary" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button>
-            <a-button type="primary" class="button-info" v-if="$hasPermissions('B_salesAdd')" @click="toWaitCostOrder">批量转</a-button>
+            <a-button type="primary" class="button-info" v-if="$hasPermissions('B_convertExpense')" @click="toWaitCostOrder">批量转</a-button>
           </div>
           <div style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
             <div class="tongji-bar">
@@ -273,7 +273,7 @@
                 size="small"
                 type="link"
                 class="button-warning"
-                v-if="record.billStatus=='FINISH' &&(record.expenseClainFlag == 'N' ||record.expenseClainFlag == 'M' )"
+                v-if="record.billStatus=='FINISH' &&(record.expenseClainFlag == 'N' ||record.expenseClainFlag == 'M' )&&$hasPermissions('B_convertExpense')"
                 @click="handleExpense(record)"
               >转费用报销单</a-button>
             </div>

+ 1 - 0
src/views/salesManagement/waitDispatchNew/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="waitDispatch-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.salesBillNo }}</span>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName || '--' }}</span>
         </template>
       </a-page-header>

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.111/ocs-admin',
+        // target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {