瀏覽代碼

1、调整1

huangmp 2 年之前
父節點
當前提交
04bb99ba0d

+ 2 - 2
src/components/order-card-item/index.vue

@@ -73,7 +73,7 @@
       </div>
     </div>
     <el-dialog :visible.sync="previewPicDialogVisible" :modal="false" title="图片预览" width="20%" top="3vh" v-if="previewPicDialogVisible">
-      <div v-if="prodType === '小卡'" class="previewClass" :style="{width: previewWidth + 'px', height: previewHeight + 'px', borderWidth: previewWidth * 0.0465 + 'px'}">
+      <!--<div v-if="prodType === '小卡'" class="previewClass" :style="{width: previewWidth + 'px', height: previewHeight + 'px', borderWidth: previewWidth * 0.0465 + 'px'}">
       </div>
       <div  v-if="prodType === '书签'" class="previewClass" :style="{width: previewWidth + 'px', height: previewHeight + 'px', borderWidth: previewWidth * 0.0264 + 'px'}">
       </div>
@@ -84,7 +84,7 @@
       <div v-if="prodType === '徽章'" class="previewClass" :style="{width: previewWidth + 'px', height: previewHeight + 'px', borderWidth: previewWidth * 0.0813 + 'px', borderRadius: 100 + '%'}">
       </div>
       <div v-if="prodType === '手幅'" class="previewClass" :style="{width: previewWidth + 'px', height: previewHeight + 'px', borderWidth: previewWidth * 0.0255 + 'px'}">
-      </div>
+      </div>-->
       <el-image ref="previewImageRef" :src="previewPicUrl" alt="" @load="previewLoad" style="width: 100%; height: 100%"/>
 <!--      <CanvasPreview :image-url="previewPicUrl"></CanvasPreview>-->
     </el-dialog>

+ 1 - 3
src/components/order-pdf-generate/index.vue

@@ -13,9 +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="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
-          <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
+          <el-option key="Lightning" label="闪电" value="Lightning"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="打印产品" prop="prodType">

+ 1 - 4
src/components/order-print-create/index.vue

@@ -13,10 +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="Lightning" label="闪电打印" value="Lightning"></el-option>
-          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
-          <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
+          <el-option key="Lightning" label="闪电" value="Lightning"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="打印产品" prop="prodType">

+ 2 - 5
src/views/modules/afterSales/returnDelivery.vue

@@ -6,9 +6,7 @@
         <div class="input-row">
           <el-form-column label="打印渠道" class="search-form-item" v-if="shopId === 1">
             <el-select v-model="searchForm.printChannel" clearable>
-              <el-option key="KuaiYin" label="快印" value="KuaiYin"></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-column>
           <el-form-item label="订单号" class="search-form-item">
@@ -58,8 +56,7 @@
           <!-- 订单号 -->
           <el-table-column label="打印渠道" prop="printChannel" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.printChannel === 'KuaiYin'">快印</span>
-              <span v-if="scope.row.printChannel === 'GSART'">广森</span>
+              <span v-if="scope.row.printChannel === 'Lightning'">闪电</span>
             </template>
           </el-table-column>
           <el-table-column label="订单号" prop="orderNumber" align="center">

+ 0 - 3
src/views/modules/afterSales/thirdAfterSales-add-or-update.vue

@@ -11,9 +11,6 @@
         <el-col :span="12">
           <el-form-item label="售后渠道" prop="printChannel">
             <el-select key="printChannel" v-model="dataForm.printChannel" :disabled="isView">
-              <el-option label="广森" value="GSART"></el-option>
-              <el-option label="快印" value="KuaiYin"></el-option>
-              <el-option label="蜗牛" value="WoNiu"></el-option>
               <el-option label="闪电" value="Lightning"></el-option>
             </el-select>
           </el-form-item>

+ 1 - 4
src/views/modules/afterSales/thirdAfterSales.vue

@@ -6,10 +6,7 @@
         <div class="input-row">
           <el-form-item label="售后渠道" class="search-form-item" v-if="shopId === 1">
             <el-select v-model="searchForm.printChannel" clearable>
-              <el-option label="广森" value="GSART" v-if="shopId === 1"></el-option>
-              <el-option label="快印" value="KuaiYin" v-if="shopId === 1"></el-option>
-              <el-option label="蜗牛" value="WoNiu" v-if="shopId === 1"></el-option>
-              <el-option label="闪电" value="Lightning" v-if="shopId === 1"></el-option>
+              <el-option label="闪电" value="Lightning"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="订单编号" class="search-form-item">

+ 0 - 6
src/views/modules/order/order.vue

@@ -977,9 +977,6 @@
       label-width="80px">
       <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="WoNiu" label="蜗牛" value="WoNiu"></el-option>
-          <el-option key="KuaiYin" label="快印" value="KuaiYin"></el-option>
           <el-option key="Lightning" label="闪电" value="Lightning"></el-option>
         </el-select>
       </el-form-item>
@@ -1002,9 +999,6 @@
       >
         <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="WoNiu" label="蜗牛" value="WoNiu"></el-option>
-            <el-option key="KuaiYin" label="快印" value="KuaiYin"></el-option>
             <el-option key="Lightning" label="闪电" value="Lightning"></el-option>
           </el-select>
         </el-form-item>

+ 0 - 2
src/views/modules/settlement/print-settlement-add-or-update.vue

@@ -13,8 +13,6 @@
       ref="dataForm">
       <el-form-item label="打印渠道">
         <el-select v-model="dataForm.printChannel" placeholder="请选择打印渠道" :disabled="dataForm.thirdSettleId != null">
-          <el-option key="KuaiYin" label="快印" value="KuaiYin"></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>

+ 4 - 11
src/views/modules/settlement/third-print-settlement.vue

@@ -10,8 +10,6 @@
               clearable
               placeholder="请选择打印渠道"
               size="small">
-              <el-option key="KuaiYin" label="快印" value="KuaiYin"></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>
@@ -164,14 +162,13 @@
           <el-table-column
             align="center"
             width="110px"
-            :label="shopId == 66? '打包快递结算金额(按件2.8元)':'人工结算金额(按件0.4元)'"
+            label="打包快递结算金额(按件2.8元)"
             prop="settleLaborAmount">
             <template slot-scope="scope">
               <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            v-if="shopId == 1"
             align="center"
             width="110px"
             label="快递结算金额(已发货)"
@@ -190,7 +187,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="shopId === 1"
             align="center"
             label="售后结算金额"
             prop="settleAfterSalesAmount">
@@ -250,24 +246,21 @@
                 class="default-btn text-btn"
                 @click="viewSettlementDetail(scope.row)">小计</div>
               <div
-                v-if="shopId == 1"
                 class="default-btn text-btn"
                 @click="addOrUpdateHandle(scope.row.thirdSettleId)">
                 编辑
               </div>
               <div
-                v-if="shopId == 1"
                 class="default-btn text-btn"
                 @click="syncSettlement(scope.row)">更新</div>
               <br/>
-              <div
-                v-if="shopId == 1"
+             <!-- <div
                 style="margin: 0 0"
                 class="default-btn text-btn"
                 @click="openModifySettleDeliveryDialog(scope.row.thirdSettleId)">
                 修改运费
-              </div>
-              <br/>
+              </div>-->
+<!--              <br/>-->
               <div
                 style="margin: 0 0"
                 class="default-btn text-btn"