1

.env.development

@@ -13,5 +13,6 @@ VUE_APP_IM_API = 'http://127.0.0.1:8089'
 VUE_APP_WS_IM_API = 'ws://127.0.0.1:8089'
 // 静态资源文件url
 //VUE_APP_RESOURCES_URL = 'https://img.mall4j.com/'
-VUE_APP_RESOURCES_URL = 'https://jtmall-oss.wangquan666.com/'
+//VUE_APP_RESOURCES_URL = 'https://jtmall-oss.wangquan666.com/'
+VUE_APP_RESOURCES_URL = 'https://ecard-oss.58for.com/'
 

src/components/order-pdf-generate/index.vue

@@ -13,7 +13,7 @@
     >
       <el-form-item label="打印渠道" prop="printChannel">
         <el-select v-model="dataForm.printChannel" clearable filterable @change="handlePrintChannelChange">
-          <el-option key="GSART" label="广森数码" value="GSART"></el-option>
+<!--          <el-option key="GSART" label="广森数码" value="GSART"></el-option>-->
         </el-select>
       </el-form-item>
       <el-form-item label="打印产品" prop="prodType">

src/components/order-print-create/index.vue

@@ -13,8 +13,8 @@
     >
       <el-form-item label="打印渠道" prop="printChannel">
         <el-select v-model="dataForm.printChannel" clearable filterable @change="handlePrintChannelChange">
-          <el-option key="GSART" label="广森数码" value="GSART"></el-option>
-          <el-option key="Lightning" label="闪电打印" value="Lightning"></el-option>
+<!--          <el-option key="GSART" label="广森数码" value="GSART"></el-option>-->
+<!--          <el-option key="Lightning" label="闪电打印" value="Lightning"></el-option>-->
           <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
         </el-select>
       </el-form-item>
@@ -54,7 +54,7 @@ export default {
       areaList: [],
       dataForm: {
         orderNumber: null,
-        printChannel: "GSART",
+        printChannel: "WoNiu",
         shopId: null,
         prodType: null,
         thirdSkuId: null,
@@ -119,6 +119,8 @@ export default {
                 }
               })
             }
+          }).catch(() => {
+            this.orderCreateLoading = false;
           })
         }
       })

src/views/modules/order/order.vue

@@ -270,13 +270,13 @@
             >
               {{ $t("order.transactionFailed") }}
             </li>
-            <li
+            <!--<li
               :class="['nav-item', activeName == 7 ? 'selected' : '']"
               data-sts="7"
               @click="selectNav($event)"
             >
               {{ $t("group.waitGroup") }}
-            </li>
+            </li>-->
             <li
                     :class="['nav-item', activeName == 8 ? 'selected' : '']"
                     data-sts="8"
@@ -291,23 +291,23 @@
             >
               打印待发货
             </li>
-            <li
+            <!--<li
                     :class="['nav-item', activeName == 10 ? 'selected' : '']"
                     data-sts="10"
                     @click="selectNav($event)"
             >
               普通待打印
-            </li>
+            </li>-->
           </ul>
           <ul class="nav-right"></ul>
         </div>
         <el-checkbox @change="checked=>handleSelectAll(checked)" class="all-check-btn" >全选 </el-checkbox>
         <span v-if="dataListSelections.size" class="had-selected">已选 {{dataListSelections.size}}</span>
-        <div
+        <!--<div
             class="default-btn"
             @click="generatePrintPdfBatch">
           批量生成PDF
-        </div>
+        </div>-->
         <div
           class="default-btn"
           @click="openCreateOrderBatchDialog">
@@ -357,9 +357,9 @@
             <span class="order-index">No.{{index + 1}}</span>
             <span class="order-number">{{ $t("order.number") }}:{{ order.orderNumber }}</span>
             <span class="order-time">{{ $t("order.createTime") }}:{{ order.createTime }}</span>
-            <el-tag effect="dark" v-if="order.auditStatus==0" type="danger">待审阅</el-tag>
-            <el-tag effect="dark" v-else-if="order.auditStatus==1" type="success">已审阅</el-tag>
-            <el-tag effect="dark" v-else type="danger">待审阅</el-tag>
+<!--            <el-tag effect="dark" v-if="order.auditStatus==0" type="danger">待审阅</el-tag>-->
+<!--            <el-tag effect="dark" v-else-if="order.auditStatus==1" type="success">已审阅</el-tag>-->
+<!--            <el-tag effect="dark" v-else type="danger">待审阅</el-tag>-->
             <!-- <span>店铺名称：{{order.shopName}}</span> -->
             <!-- <span>买家：19999999999</span>
             <span >联系电话：19999999999</span>-->
@@ -891,8 +891,9 @@
       >
         <el-form-item label="打印渠道" prop="printChannel">
           <el-select v-model="printChannel" clearable filterable>
-            <el-option key="GSART" label="广森数码" value="GSART"></el-option>
+<!--            <el-option key="GSART" label="广森数码" value="GSART"></el-option>-->
             <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
+<!--            <el-option key="Lightning" label="闪电打印" value="Lightning"></el-option>-->
           </el-select>
         </el-form-item>
       </el-form>
@@ -1075,7 +1076,7 @@ export default {
       infoWidth: '400px',
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
       orderCreateBatchVisible: false,
-      printChannel: "GSART",
+      printChannel: "WoNiu",
       orderCreateBatchLoading: false
     }
   },

src/views/modules/order/orderInfo.vue

@@ -553,21 +553,21 @@
                   </el-col>
                 </el-row>
                 <el-row>
-                  <el-col :span="12">
+                  <!--<el-col :span="12">
                     <div class="item">
                       <div class="text">PDF文件：</div>
                       <el-link v-if="printOrder.worksUrl != null" type="primary" :underline="false" :href="resourcesUrl + printOrder.worksUrl" target="_blank">查看文件</el-link>
                       <el-button :loading="generatePdfLoading" v-if="printOrder.worksUrl == null" type="primary" size="mini" @click="openGeneratePdfDialog">生成PDF</el-button>
                     </div>
-                  </el-col>
-                  <el-col :span="12">
+                  </el-col>-->
+                  <!--<el-col :span="12">
                     <div class="item" style="width:320px;">
                       <div class="text">审阅状态：</div>
                       <el-button v-if="dataForm.auditStatus==0" type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
                       <el-button v-else-if="dataForm.auditStatus==1" type="success" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">已审阅</el-button>
                       <el-button v-else type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
                     </div>
-                  </el-col>
+                  </el-col>-->
                 </el-row>
                 <el-row>
                   <el-col :span="24">