lilei 2 years ago
parent
commit
35e471959c

+ 4 - 1
src/views/salesManagement/pushOrderManagement/explainInfoModal.vue

@@ -9,7 +9,7 @@
     @cancel="handleCancel"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="min-height:200px;">
+      <div style="min-height:100px;">
         <div v-if="infoList.length">
           <div class="infoList-item" v-for="item in infoList" :key="item.id">
             <div><strong>{{ item.createDate }}</strong></div>
@@ -28,6 +28,9 @@
             placeholder="请输入发货说明(最多100字符)"
             allowClear />
         </div>
+        <div style="text-align: center;color:#999;padding-top:20px;" v-if="infoList.length==0 && mode == 'view'">
+          暂无发货说明
+        </div>
       </div>
       <div class="btn-cont" v-if="mode=='edit'">
         <a-button @click="handleCancel">取消</a-button>

+ 1 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -151,7 +151,7 @@
               type="link"
               class="button-error"
               :loading="!!tipData"
-              v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_UNABLE_PRINT')"
+              v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
               @click="handlePrint(record,0)"
             >取消打印</a-button>
           </div>

+ 1 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -127,7 +127,7 @@
           </template>
           <!-- 备货打印状态 -->
           <template slot="printStatus" slot-scope="text, record">
-            <span v-if="record.printStatus=='NO_PRINT'" class="link-bule" @click="handlePrintStatus(record)">{{ record.printStatusDictValue }}</span>
+            <span v-if="record.printStatus=='NO_PRINT'&&$hasPermissions('B_noPrintStatus')" class="link-bule" @click="handlePrintStatus(record)">{{ record.printStatusDictValue }}</span>
             <span v-else>{{ record.printStatusDictValue }}</span>
           </template>
           <div slot="costTitle">

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.183:8602/ocs-admin',
+        // target: 'http://192.168.0.183:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {